20e maj
Merge branch 'Johanna5'

Conflicts:
	application/views/profile/followers/follower_button.php
	application/views/profile/profile_layout.php
Johanne merge klar