log message
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
Adds user-info template and get-started template, needs updated route states
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
remove unnecesary comments and cleans up directive
reformat some of the code
Merge pull request #246 from jamesongamble/myRisk

Add user-info template and get-started template, needs updated route st...
Clean up mobile navigation code
style map markers to match specs
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
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