django 1.5
Merge branch 'master' of github.com:b3ni/django-bootcom-template