temp
Merge branch 'master' of https://github.com/tech-junkie/mobile-team-app

Conflicts:
	.DS_Store
	css/jquery.mobile-1.3.0.min.css
	css/jquery.mobile.structure-1.3.0.min.css
	css/mobileapp.css
	jquery.mobile-1.3.0.min.css
	jquery.mobile.structure-1.3.0.min.css
	mobileapp.css
	www/css/jquery.mobile-1.3.0.min.css
	www/css/jquery.mobile.structure-1.3.0.min.css
	www/css/mobileapp.css