vers
Merge branch 'master' of github.com:kirilovskikh/JavaSpringServer

Conflicts:
	hsqldb-2.3.2/hsqldb/hsqldb/hemrajdb.lck
	hsqldb-2.3.2/hsqldb/hsqldb/hemrajdb.log