Merge branch 'hotfix/updates'
Add Flattr button as a test
Merge branch 'hotfix/flattr' into develop