fix typo
update django requirement
Merge branch 'master' into django1.5