AddPersoNWidget2 optionally supports Home Phone (active in LACRMT), Vi
updates from IFRC
Merge branch 'master' of git://github.com/nursix/eden
Move human_resource & person controllers to module for reuse within
Deployments module
Start data model for deploy
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	controllers/deploy.py