Missing body tag in base.html
Merge remote-tracking branch 'refs/remotes/origin/Bugfixes' into dev