fixed #5
Merge branch 'master' of https://github.com/phetsims/wave-on-a-string

Conflicts:
	js/view/control/BottomControlPanel.js