Resolving conflicts
Now pulling in social profile images.
Merge branch 'development' into Feature_SocialProfilePics
Updated Jake's 'likes' feed to reflect user API changes.
Merge branch 'Feature_SocialProfilePics' into aws_production

Conflicts:
	web/assets/js/app.js