WIP
Merge branches 'master' and 'master' of github.com:avanha/javapp-gradle

Conflicts:
	src/main/java/org/sf/stepheng/JavaPP.java