Fixed incorrect background color
Merge branch 'refs/heads/development' into Rails