update for django 1.5
Merge pull request #140 from SushiTee/master

update for django 1.5