Albi changes
Merge branch 'refs/heads/pb-0.6' into pre-j

Conflicts:
	gran/Zgran~.model.maxpat
	light/jalg.modulation.maxpat
	light/proj.model.maxpat
	light/projMIDIn.view.maxpat