cleaned up the index.html page
modified index.html. cordova-2.7.0 needs to be below controllers/angular code
getting camera to work, and styling
camera styling
merged with ed's repo
platforms folder is saved in git
viewEvents now working properly
Merge branch 'master' of https://github.com/moog16/meetMeApp into moog16-master

* 'master' of https://github.com/moog16/meetMeApp:
  platforms folder is saved in git
  merged with ed's repo
  camera styling
  getting camera to work, and styling
  modified index.html. cordova-2.7.0 needs to be below controllers/angular code
  cleaned up the index.html page

Conflicts:
	gruntfile.js
	www/index.html
	www/js/controllers/map.js
	www/views/createActivity.html
	www/views/map.html