django 1.5and local def changes
local dev commit
Merge remote-tracking branch 'origin/five' into five