init new branch
Merge branch 'newgen' of git@github.com:d3scomp/JDEECo.git into newgen

Conflicts:
	jdeeco-parent/pom.xml