Bootstrap wysihtml5
Add in boostrap-wysihtml5 stuff
Make the toolbar for wysihtml5 smaller

We don't need a huge toolbar. Use a smaller one here.
Show the last few likers for each object in major streams and favorites
Make sure likes list shows up for objects
More detailed check for collection data
Endpoint for group members
Allow posting an object to a collection members feed to add the object to the feed
Feed links should be objects
new controls
Correct the URL for the followers/following collections
Better URLs for virtual collections
Merge branch 'master' into list-management

Conflicts:
	routes/api.js
Add member button for lists
Make showing modals easier
Merge branch 'avatar'
Move user page content to its own templates
Only load the user-content for activities
Use #user-content for favorites
Only reload user content for profile-block pages