Mindre ændringer

asfasfasfasf
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/DatabaseLogic/DatabaseConnection.class