resolve merge conflict
Merge branch 'master' of github.com:phetsims/scenery-phet
Merge branch 'master' of github.com:phetsims/scenery-phet
add WavelengthSlider to SceneryPhetScreenView
fix jshint issue