resolving naming and import issues
Merge branch 'master' of github.com:lightstrike/carteblanche-django-boilerplate