move to spring 4.0.7
move to hikari 2.0.1 java6 compatible
update maven dependencies
Merge branch 'spring-4.0'

Conflicts:
	pom.xml