Include ico and png files in standalone-jar
Port back some fixes from the unimelb branch
POC demonstration of simplified role management form
Fix css resource loading issue introduced by update to Base.jar
Compatibility with latest Base.jar
Pull updates off master
Build using java 7
Merge with master