increment maven pom.xmlversions because limaCore is modified
Merge remote branch 'origin/master'

Conflicts:
	pom.xml