testing changes
Merge branch 'master' of http://github.com/shaibazg/hackathon

Conflicts:
	jqm/src/main/resources/static/js/map.js