java version 1.7
Merge branch 'working-branch'

Conflicts:
	lagoonos-utils/pom.xml