Start data model for deploy
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	controllers/deploy.py
Make both deploy_deployment and deploy_human_resource_assignment doc_entities.
Deployments model refinements.
Translate tweaks: don't die if a CSV has bad chars in. Fix bad chars in
source CSVs. SR Tweak menus. CRMT: Zoom +1 on HomePage to show all
Coalitions.
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden
Simplify/Enhance Translation (many ToDos left). SR: tweak Label
Merge branch 'master' of git://github.com/flavour/eden
One more vi.py update
Merge branch 'master' of git://github.com/flavour/eden
Source strings should be US English
Merge branch 'master' of git://github.com/flavour/eden