Merge branch 'dev' into TestOauthDance
Fixed the OAuth, works fine :) :)
s

Conflicts:
	main/twitter_follow_bot2.pyc
	main/views.pyc
	mojito2/settings.pyc
	mojito2/urls.pyc