commiting everything I have finished for Chris to pick it up
Merge branch 'feature_hippo-java' of github.com:meltmedia/cadmium-admin into feature_hippo-java