Added server side caching and discovery of cadmium sites: CADMIUM-157
Merge branch 'stage2' of github.com:meltmedia/cadmium-admin into stage2

Conflicts:
	deployment/services/src/main/java/com/meltmedia/cadmium/admin/guice/Module.java