Clean up home screen layout resources, and prepare for fixed-height
option
Reinstate centered text
Fix layour problems on home screen
Merge branch 'develop' of https://github.com/akvo/akvo-flow into develop

Conflicts:
	WFPMapping/device/survey/res/values/arrays.xml
Update to sort order that got lost in some merge