Changes @ BC
Merge branch 'master' of github:leronen/leronen-java

Conflicts:
	src/util/IOUtils.java