getters setters
Merge branch 'develop'

Conflicts:
	pom.xml