Updated GUI/design
Merge branch 'develop' of https://github.com/samgqroberts/mobile-polaris into develop

Conflicts:
	BLUE/en.lproj/MainStoryboard_iPad.storyboard
	BLUE/en.lproj/MainStoryboard_iPhone.storyboard
Merge branch 'develop' of https://github.com/samgqroberts/mobile-polaris into develop
Merge branch 'develop' of https://github.com/samgqroberts/mobile-polaris into develop