moved things around for django 1.6
moved things around for django 1.6
moved things around for django 1.6
moved things around for django 1.6
moved things around for django 1.6
moved things around for django 1.6
finished fixing for django 1.6
finished fixing for django 1.6