Fixed domain class hibernate
Merge branch 'develop' of https://github.com/tncgroup/stsrepo into develop

Conflicts:
	TNC/src/main/webapp/WEB-INF/spring-servlet.xml