Begin snapshot 1.2.0
Fix tests
Merge branch 'develop'

* develop:
  Fix tests
  Begin snapshot 1.2.0

Conflicts:
	pom.xml