Deadlines
Merge branch 'master' of https://github.com/Prikkel/UML

Conflicts:
	application/views/manage_deadlines_view.php
Commit verneukt alles...