Wrong license header...
Merge branch 'cg_gwtp-76'

Conflicts:
	checkstyle/src/main/resources/checkstyle.xml