Anders
Merge branch 'master' of https://github.com/basilfx/Course-SecureDataManagement

Conflicts:
	app/app.js
Views verbeterd