added light rays for conductivity test (without caching)
Merge branch 'master' of https://github.com/phetsims/acid-base-solutions