tests
Merge branch 'dev' into testing
nose django
testing
testing
drop django 1.7 from libs
Merge branch 'testing' into dev