bug: unavailable retina images
Merge branch 'master' into release

Conflicts:
	js/views/map-view.js
bump to v1.1.1