Updated for new domain
Added discovery button to admin
Merge pull request #30 from meltmedia/feature_site-discovery

Feature site discovery
updated cadmium version and added scope to auth.js
Merge branch 'master' of github.com:meltmedia/cadmium-admin into develop
Updated properties to match new environment for cadmium admin.
Merge pull request #31 from meltmedia/develop

Preparation for next release
Moved deployment version to 1.0.1 for release
Moved to 1.0.2-SNAPSHOT
Merge branch 'master' of github.com:meltmedia/cadmium-admin into feature_hippo-java

Conflicts:
	deployment/pom.xml
	deployment/war/src/main/webapp/WEB-INF/cadmium.properties
	src/files/js/auth.js