fix csrf token
Merge branch 'template' into develop