updated to django 1.7 in requirements
migration complete
migration finished
Merge branch 'feature/migrate_to_django_17' into develop