Finished testing and fixing
Merge branch 'stage2' of github.com:meltmedia/cadmium-admin into fixes-discovery

Conflicts:
	deployment/services/src/main/java/com/meltmedia/cadmium/admin/dao/Dao.java
Merge pull request #11 from meltmedia/fixes-discovery

Finished testing and fixing