updated to Django 1.7
merge