Include ico and png files in standalone-jar
Port back some fixes from the unimelb branch