Merge branch 'master' into develop
Small fix to make sure background always shows up
Version bump
Merge branch 'develop'