Changed assets, added background texture
Merge remote-tracking branch 'origin/master' into merging