merge conflict in assemble.gradle
Move groovy.icns to lib

Move groovy.icns to lib, to make the OSX install more
compatible with homebrew.
Provides a more recent snapshot of the wiki