merge from upstream
Merge branch 'develop' of https://github.com/Murdock01/izpack into develop
Fix script to install icon in Linux when dir contains whitespace
Merge branch 'master' into develop

Conflicts:
	izpack-util/src/test/java/com/izforge/izpack/util/config/base/RegTest.java
Merge pull request #149 from mdediana/master

Fix script to install icon in Linux when dir contains whitespace
Merge branch 'master' of https://github.com/izpack/izpack