Fix layers not highlighting after zooming
Merge branch 'master' into better-mobile-ux2

Conflicts:
	build/banjir/js/application.min.js
Merge branch 'better-mobile-ux2'