Feature/support django 1.6