Fix formatter problems
Merge branch 'master' of https://github.com/simpuls/core

Conflicts:
	jdk-1.7-parent/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/GMap.java