Cleanage commit 2
Merge branch 'master' of github.com:Alexiscap/slyset

Conflicts:
	application/controllers/pop_in_general.php
	application/models/follower.php
	application/views/follower/mc_followers.php