feature/fix-tests: fixing dependency versions
feature/fix-tests: upgrading to python27 api
feature/fix-tests: using django 1.2
develop:
Merge branch 'feature/fix-tests' into develop