updated db.properties
Merge branch 'develop' of https://github.com/Plow74/setinfo-web.git into
develop

Conflicts:
	src/main/webapp/WEB-INF/spring/spring-data-context.xml