upgraded chp6 to django 1.7