hammer tap works
hammer tap event works on the browser
merged with upstream.
Merge branch 'master' of https://github.com/Yonet/meetMeApp into Yonet-master

Conflicts:
	www/js/controllers/main.js
	www/js/controllers/map.js