reading from db
Merge remote-tracking branch 'origin/master'

Conflicts:
	reg-sys/pom.xml
files for db