Java Anwendung Features
Merge remote-tracking branch 'origin/master'

Conflicts:
	DBSproject/src/Database.java