log message
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Clean up mobile navigation code
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Clean up mobile navigation code
Begins changing tabs to icons
Changes nav bar to icon only
Removes unnecessary code accidentally added to settings for this commit
Break up controllers.js and services.js to have more modular services/controllers
adding dummy params till the auth is implemented
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Merge pull request #255 from jamesongamble/iconOnlyTabs

Change all navigation tabs to icons
Merge pull request #256 from suprbh/master

Add dummy params until Auth is implemented for mobile
Merge pull request #254 from jjmerino/master

Update markers to match style
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp into mobile/refactor

Conflicts:
	mobile/www/js/services/geo-location.js
	mobile/www/templates/settings.html
	mobile/www/templates/tabs.html
Refactor controllers and services file structure
enable geolocation to run in background after app terminates
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
disable debug for production
Major changs to the report page. Update to schema to accomodate much more information.