Katrins changes
Merge branch 'master' of https://github.com/naehrlich/dbacompanydemo.git

Conflicts:
	src/java/main/net/gumbix/dba/companydemo/db/DBAccess.java