last stuff
Merge branch 'master' of https://github.com/Lystlund/SoundRunner

Conflicts:
	SoundRunner/OSCtesting/OSCtesting.userprefs