updates develop branch with layer switcher code
udpates to color scale