corrected tab notes
changed templates
Merge branch 'master' of github.com:hipsterwannabe/babytrackerapp

# By Danny Jimenez
# Via Danny Jimenez (1) and Greg Vallejo (1)
* 'master' of github.com:hipsterwannabe/babytrackerapp:
  added settings view, added route and controller for that view. made edits on the menu view as well.

Conflicts:
	platforms/ios/cordova/console.log
Merge branch 'master' of github.com:hipsterwannabe/babytrackerapp

# By Danny Jimenez
# Via Danny Jimenez
* 'master' of github.com:hipsterwannabe/babytrackerapp:
  added comments