Uhmm. Paar DAO's requests gemaakt etc.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Database/SelectDAO.java