almost done :)
Merge branch 'feature#split-out-discovery' of github.com:meltmedia/cadmium-admin into feature_pequod-jira-fix

Conflicts:
	deployment/services/src/main/java/com/meltmedia/cadmium/admin/jersey/CookieBasedAuthorizationService.java
all done and tested locally
Merge pull request #21 from meltmedia/feature_pequod-jira-fix

Feature pequod jira fix