Fixed a styling bug with the maps, and the quota exceeded error on chrome
Merge branch 'nav' of https://github.com/avalanchedotca/CACMobile into f-quota-errors
Lots of styling
Changes to styles
Merge branch 'nav' of https://github.com/avalanchedotca/CACMobile into nav

Conflicts:
	app/scripts/services/Data.js
	app/styles/main.scss
Deleted stupid merge files
A merge of Ben's logic changes with my style changes