Merge branch 'master' into development
Fixed display with only one background image
Merge branch 'development'