commit
Merge branch 'master' of https://github.com/plec/oneappworkaround

Conflicts:
	README.md
	app/scripts/main.js
	app/scripts/templates/ActivityDetails.hbs
	app/scripts/vendor/leafletUtils.js
	app/scripts/views/ActivityListingView.js
	bower.json