Merge branch 'hotfix/remove-bitdeli'
up
Merge branch 'hotfix/badges' into develop