Bumped version 1.8.0-SNAPSHOT
Merge branch 'master' into develop

Conflicts:
	pom.xml
Bumped version 1.8.0