still working on test cases
Merge branch 'master' of github.com:meltmedia/cadmium-admin into feature_update-dates

Conflicts:
	deployment/services/src/main/java/com/meltmedia/cadmium/pequod/jersey/PequodResource.java
update and delete now work
Merge branch 'feature_hippo-java' of github.com:meltmedia/cadmium-admin into feature_update-dates
Merge pull request #28 from meltmedia/feature_update-dates

Feature update dates into hippo