Merge branch 'master' of https://github.com/Conquer-Dev/Conquer-Core

Conflicts:
	conquer-core/pom.xml
Updated pom.xml
Updated pom.xml