half working commit
Merge branch 'mamontov'

Conflicts:
	src/safeguard/DatabaseHelper.java
	src/safeguard/SafeGuard.java