Merge branch 'integration' of https://github.com/onepercentclub/bluebottle into integration
text wallposts in the pocket
Improve wallposts
lots of changes
Fix Slides & Quotes for home
Fix task member management
show avatar
Merge branch 'integration' of https://github.com/jakoblaegdsmand/bluebottle into integration

Conflicts:
	bluebottle/tasks/static/js/bluebottle/tasks/controllers.js
	bluebottle/tasks/templates/tasks/task_activity.hbs
	bluebottle/wallposts/templates/wallposts/media_wallpost_new.hbs
	bluebottle/wallposts/templates/wallposts/text_wallpost_new.hbs
Clean up task members
Merge pull request #154 from gannetson/integration

Integration