Currently showing duplicate PA layers fixed on pica
Merge branch 'master' into pica-layer-control

Conflicts:
	app/assets/javascripts/application.js