add twitter feed
Merge branch 'feature/twitter_integration' into feature/view_refactor

Conflicts:
	Gemfile
Merge branch 'feature/facebook_integration' into feature/view_refactor
User views refactored
Some event views stuff.
Merge branch 'feature/view_refactor' into dev