Feature: upgraded to django 1.6