Delete forms  and hotfixes in base.html
Merge branch 'rm' into develop