Separated button bar
Moved gear menu up
Fixed back button in surveys
Ready for beta
Merge branch 'android-l' into sites

Conflicts:
	app/js/pages/SiteMapPage.coffee