Feature/django update to 1.6