12maj16:27
14maj

Forum
15 maj
Merge remote-tracking branch 'origin/Sofias-gren-4'

Conflicts:
	application/models/forum_model.php
	application/views/forum/view.php