dao invulling
Merge branch 'master' of https://github.com/JaapManenschijn/SecurityTopics

Conflicts:
	src/nl/saxion/act/security/db/Dao.java