Updates for Django 1.7

I know there is already some pull requests on this but I want a working version until the support of Django 1.7 come ;).