Temporarily disabled license plugins pending fix
Code clean, remove useless classes
Merge branch 'master' into cleanup

Conflicts:
	pom.xml
Rename method