Merge branch 'master' of https://github.com/izpack/izpack

Conflicts:
	izpack-tools/src/main/java/com/izforge/izpack/util/Platform.java