cleaning
updates
Merge branch 'django-1.7'