Merge branch 'master' of https://github.com/BMK-2331/safeguard

Conflicts:
	src/safeguard/DatabaseHelper.java
some identation problems
Merge branch 'master' of https://github.com/BMK-2331/safeguard

Conflicts:
	src/safeguard/DatabaseHelper.java
fix identation. god why is it so hard