use django 1.5 instead of 1.5.1
Merge branch 'master' into projects