Changed RockColor for test purposes
Merge branch 'Layout' into develop
Revert "Changed RockColor for test purposes"

This reverts commit 77a5b48b671fb41e692218415a600d716a58fcc9.