Updated project to use Django 1.6
Updated `django-debug-toolbar` version
Merge branch 'master' into django-16