Bumped version 1.8.0
Merge branch 'master' into develop

Conflicts:
	pom.xml