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
Merge pull request #37 from eddyfh/master

Additional markers and link for dummy data
commented out request while debuggin connection to server
Merge branch 'master' of https://github.com/meamstack/meetmeapp

* 'master' of https://github.com/meamstack/meetmeapp:
  Small correction to my previous gruntfile change
  Added a few dummy data points and link for create activity
  daySlider is back and fixed on the bottom
  daySlider is fixed on the left, dayslider disappeared
  added a status bar
  corrected the margin around the map
  Facebook login flow implemented, and angular mobile nav implemented
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
Merge pull request #39 from emailnitram/master

merged with moog16  findEvents works on phonegap. currently not working on chrome browser
hammer tap works
hammer tap event works on the browser
ervice working
activity can now get saved
merged with upstream.
included images for team
Merge branch 'master' of https://github.com/meamstack/meetmeapp

Conflicts:
	www/js/controllers/map.js
Merge pull request #41 from emailnitram/master

working map WIP