Upgraded to Django1.7