Increment version to 1.2.4
Added CommandManager as a dependency
Added CommandManager as a dependency
removed including xml files as additional resources.
Merge branch 'master' into 2.x

Conflicts:
	pom.xml