RDRT: add menu item for "active missions" and link main menu item to it, fix country representation in deployments summary, add mission name, change "Operation" => "Appeal Code"
RDRT: Apply assignment field customizations in both mission and assignment controllers
Project Activity & Supply Distribution Model & Configuration Tweaks. HXL Export stylesheet.
pr_RoleRepresent
CRMT: Fix prepop & GeoJSON
Merge branch 'master' of git://github.com/nursix/eden
Typo.
Fix update_location_tree() to ctach the case where all but WKT is fine.
Fix typo with support for Translation
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/s3db/hrm.py
Fix for member profile => update training
Fix missing icons.
RDRT tweaks
Back out last change to avoid conflict.
Merge branch 'master' of git://github.com/flavour/eden
Put change back, propagate.