Fixed spacing in templates
Generated HTML: Removed extraneous whitespace from templates
Merge remote-tracking branch 'deploy/static' into static