First commit to make sure I don't lost my work.
Merge branch 'master' of https://github.com/samuelitor/django-tps