fixed test suite, added install django 1.5
Merged master branch