Minor fixes
Merge branch 'interface'

Conflicts:
	src/safeguard/AccessController.java
	src/safeguard/DatabaseHelper.java
	src/safeguard/Engine.java