change public facing references from 'layer' to 'collection'
review changes
review changes stripped out map.js to the bone
Merge branch 'master' into layer_refs2_collection

Conflicts:
	web-app/js/portal/lang/en.js
	web-app/js/portal/ui/MapOptionsPanel.js
Merge pull request #373 from aodn/layer_refs2_collection

change public facing references from 'layer' to 'collection'