Merge branch 'user-microposts'

Conflicts:
	.idea/dataSources.xml
follow/unfollow
Add user following