Merge remote-tracking branch 'origin/master' into new-design
Indent properly, remove trailing whitespaces and and change styles for badges
Indent templates and change date format in footer
Merge remote-tracking branch 'origin/refined-appearance'