#24 Use jtds
Merge remote-tracking branch 'hibernarm-service/master'

Conflicts:
	pom.xml