Added django template blocks tags and 'extends from base'
Merge branch 'fixtemplate' into develop