Update map id
Merge branch 'back3'

Conflicts:
	project.clj
	resources/public/js/main.js