Implementation of the model has been simplified
Useless dependecies have been removed
Merge branch 'develop'

Conflicts:
	pom.xml