update osc
Merge branch 'master' of github.com:jberkel/afterglow

Conflicts:
	render/js/oscFriedrich.js