Upgrade django rest framework
Merge branch 'hotfix/20141003-fix'
Merge tag '20141003-fix' into develop

Upgrade django-rest-framework