upgraded to django 1.7
Merge branch 'master' of https://github.com/purplecode/probable.backlog