Add patches to support simple NAT-based networking
Add patches to NFDHCPD, the sample KVM ifup scriptand the python-nfqueue package to support simple NAT-based networking,under contrib/patches.
Make nfdhcpd dir configurable in kvm-vif-bridge
Merge branches api-current and ui-0.4, minor fixes
Merge branches api-current and ui-0.4: * Fix merge conflicts * Fix minor bug in reconciliation mgmt command * Add comments in settings.py.dist * minor PEP8 fixes