ux progress and tidy up
Merge branch 'master' of https://github.com/StrategicDevelopment/FoodCoop

Conflicts:
	app/index.html