Changed background
Merge branch 'develop'
Fixed background