Fix Django 1.6 import issue
Merge pull request #23 from diadzine/master

Fix Django 1.6 import issue