many fixes!!
Merge branch 'master' of https://github.com/Prikkel/UML

Conflicts:
	application/views/class_update_view.php
	application/views/user_update_view.php