better error message
Fixed java.lang.ClassCastException: models.X cannot be cast to models.X
upped version
Merge branch 'master' into releases

Conflicts:
	pom.xml
v2.3.6.2