log4j dependency edit scope
Merge branch 'master' of https://github.com/simpuls/core

Conflicts:
	jdk-1.7-parent/gmap3-parent/gmap3/pom.xml