ticket:9 updates for barista
Merge branch 't9_django_command'