Simplify follow/unfollow concept
Merge branch 'master' into simplify-follow

Conflicts:
	config/routes.js
Merge branch 'master' into simplify-follow
Merge branch 'simplify-follow'