ervice working
activity can now get saved
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