ツイッター追加
Merge remote-tracking branch 'origin/develop' into feature_feed
Merge remote-tracking branch 'origin/develop' into feature_feed
oauth対応google追加
Merge remote-tracking branch 'origin/develop' into feature_feed
Django1.5とDjango1.6両方で動くように修正。
new_requirements.txtはDjango1.6用です。