8e maj

Followers
8E MAJ

började på privacy settings
12e maj

privacy settings
Merge remote-tracking branch 'origin/Johanna4'

Conflicts:
	application/config/routes.php
	application/controllers/forum.php