added a fix for potential Null for content object in award on a user profile page
fixed retagging bug for django 1.4
first pass on fixing facebook login, "approve" path works
added csrf and deny request flow to oauth2, tested on fb only
whitespace changes
Korean translation
Merge pull request #107 from sk8erchoi/master

Korean translation
made all test cases pass and small refactoring of the user activity page
Merge branch 'github-master'
added RSS autodiscovery link to html head
updated changelog
adapted requirements and git tracking for heroku deploy
leftover heroku deploy changes
Configured database for heroku deploy
added requests library to ease debugging from the django shell
Updated README to refer to Putsches instead of Askbot.
Merge remote-tracking branch 'upstream/master'