Merge origin/master

Conflicts:
	pom.xml
Merge origin/master