Finisshed Add user following
Merge branch 'following-users'

Conflicts:
	.idea/workspace.xml