auto_now and auto_now_add are anyways non editable and are not shown in form, so you don't need to put it in 'exclude'
Keep template tags load at the top
Remove duplicated code. Every template should be extending from base if possible.
Merge remote-tracking branch 'origin/develop' into develop