cateogires etc
merge

Conflicts:
	dev/templates/pages/detail-islands-page.html
	prototype/detail-islands-page.html