merge test
Merge branch 'master' of https://github.com/kmetkojan/tomcat-database-session-manager

Conflicts:
	README