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
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
Merge branch 'master' of https://github.com/meamstack/meetmeapp
map, camera, everything is working
disabled button. added some alert
stylying createactivity
Merge branch 'master' of https://github.com/Yonet/meetMeApp into Yonet-master

Conflicts:
	www/js/controllers/main.js
	www/js/controllers/map.js
Merge pull request #42 from moog16/master

merged with yonet-master
event markers load when the map loads. addMarker function takes a template and shows event image
Adjusted fb for aws server
loops through newEvents and attaches the data to the marker
Merge branch 'master' of https://github.com/meamstack/meetmeapp
able to get the rigth data into infoWindow
Merge pull request #43 from eddyfh/master

Adjusted fb login for aws server
camera should work forever now