Merge branch 'master' of https://github.com/edward/forage

Conflicts:
	app/assets/batman/html/places/index.html
Merge branch 'master' of https://github.com/edward/forage