Merge origin/master

Conflicts:
	README.md
Merge origin/master

Conflicts:
	pom.xml
Merge origin/master

Conflicts:
	pom.xml
Merge origin/master