changes for Django 1.6 compatibility
Merge branch 'master' of github.com:upTee/upTee