Merge tag '0.6.81' into develop

Remove merit and badges
Add static pages (terms, privacy, imprint)

See http://pomodoro7.com/
bump version number to 0.6.82
Merge branch 'release/0.6.82'