Added DB API. Fixed some bugs in DB model and implementation
Merge branch 'master' of https://github.com/BMK-2331/safeguard

Conflicts:
	src/safeguard/DatabaseHelper.java