- map frame showing now.
Merge branch 'master' into HEAD

Conflicts:
	app/templates/index.hbs
	app/views/map.js
Merge commit 'dd7d1e6a2fb7bea44437f0576cd303411b8cade4'