Diary model update v0.1
Dairy model uitgebreid v0.2
Merge branch 'feature/Diary_Fix' into develop

Conflicts:
	application/controllers/bedroom.php
	application/views/bar.php