re #842 - Update phpmig
re #842 - Major refactor of the migration
Merge branch 'feature/842-districts' into staging

Conflicts:
	scripts/phpmig/migrations/2014/20141007122400_AddDistrictsKeys.php