Continued development of menu
Merge branch 'master' of https://github.com/polishninja/PhoneGapApp

Conflicts:
	js/controllers.js