some stashes
Merge branch 'master' of github.com:xangadix/oscRemapper

Conflicts:
	oscRemapper.depend
	oscRemapper.layout