Bootstrap v3 modifications
Merge branch 'master' of https://github.com/ripperdoc/raconteur

Conflicts:
	requirements.txt
	templates/campaign/campaign.html
	templates/campaign/campaigns.html
	templates/homepage.html
	templates/social/conversation_item.html
	templates/social/group_page.html
	templates/social/social.html
	templates/social/user_detail.html
	templates/social/user_list.html
	templates/world/article_item.html
	templates/world/base.html
	templates/world/world_view.html
Final (hopefully) merge
Merge branch 'master' of https://github.com/ripperdoc/raconteur

Conflicts:
	static/js/app.js
	templates/world/article_item.html

Another attempt at merge, hopefully no conflicts.