changing watch to include both states i.e. finalised and archived on both watches (otherwise they cancel each other out)
changes for point release. small bug fixes
Merge branch 'develop' of https://github.com/MetadataRegistry/ModelCataloguePlugin into develop

Conflicts:
	ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/catalogueElementEnhancer.coffee
	ModelCatalogueCorePlugin/grails-app/assets/javascripts/modelcatalogue/core/ui/bs/actions.coffee