Edit page gefixt
Merge branch 'development' of https://github.com/rspeerstra/project into development

Conflicts:
	admin/admin.class.php
Merge branch 'development' of https://github.com/rspeerstra/project into development