iPad
Upadet Ipad
sdfsdfds
Merge branch 'master' of https://github.com/CICM/CICM-Library

Conflicts:
	sdk-build/hoa.iPad.maxpat
hoa.scope~ et hoa.meter~.
Update helps and scope and meter
pas grand chose
test
Merge branch 'master' of https://github.com/CICM/CICM-Library

Conflicts:
	sdk-build/hoa.am~.maxhelp
	sdk-build/hoa.projector~.maxhelp
eliott
Merge branch 'master' of https://github.com/CICM/CICM-Library
Merge commit '5530c6594ed23298fcf5de23ba8615d788af0127'

Conflicts:
	sdk-build/hoa.dac~.maxhelp
	sdk-build/hoa.encoder~.maxhelp
	sdk-build/hoa.scope.maxhelp
	sdk-build/hoa.snapshot~.maxpat
	sdk-build/hoa.trajectory.maxhelp
Merge remote-tracking branch 'origin/master' into Windows

Conflicts:
	hoa.library/hoaEncoder/hoa.encoder~.c
	sdk-build/hoa.binaural~.maxhelp
	sdk-build/hoa.scope.maxhelp

	deleted:    hoa.library/Info copy 2.plist
	modified:   hoa.library/hoaConnect/hoa.connect.c
	new file:   hoa.library/hoaEncoder/hoa.encoder~.c
	new file:   hoa.library/hoaLoader/hoa.loader.c
	new file:   hoa.library/hoaLoader/hoa.loader.xcodeproj/project.pbxproj
	new file:   hoa.library/hoaMeter/hoa.meter.def
	new file:   hoa.library/hoaMeter/hoa.meter.vcxproj
	new file:   hoa.library/hoaMeter/hoa.meter~.c
	renamed:    hoa.library/hoaScope/hoa.scope.xcodeproj/project.pbxproj -> hoa.library/hoaMeter/hoa.meter~.xcodeproj/project.pbxproj
	deleted:    hoa.library/hoaScope/hoa.scope.c
	new file:   hoa.library/hoaScope/hoa.scope~.c
	new file:   hoa.library/hoaScope/hoa.scope~.xcodeproj/project.pbxproj
	deleted:    hoaLibrary.zip
	deleted:    sdk-build.zip
	new file:   sdk-build/Hoa.signalToPackedDatas.maxpat
	modified:   sdk-build/hoa.am~.maxhelp
	modified:   sdk-build/hoa.am~.maxpat
	modified:   sdk-build/hoa.binaural~.maxhelp
	modified:   sdk-build/hoa.connect.maxhelp
	modified:   sdk-build/hoa.connect.mxo/Contents/MacOS/hoa.connect
	modified:   sdk-build/hoa.dac~.maxhelp
	modified:   sdk-build/hoa.decoder~.maxhelp
	modified:   sdk-build/hoa.delay~.maxhelp
	modified:   sdk-build/hoa.encoder~.maxhelp
	modified:   sdk-build/hoa.fracorder~.maxhelp
	modified:   sdk-build/hoa.grain~.maxhelp
	new file:   sdk-build/hoa.iPad.jzml
	new file:   sdk-build/hoa.iPad.maxpat
	modified:   sdk-build/hoa.inside~.maxhelp
	modified:   sdk-build/hoa.inside~.maxpat
	modified:   sdk-build/hoa.kinect2~.maxhelp
	renamed:    sdk-build/hoa.mixer~.maxhelp -> sdk-build/hoa.meter~.maxhelp
	renamed:    sdk-build/hoa.scope.mxo/Contents/Info.plist -> sdk-build/hoa.meter~.mxo/Contents/Info.plist
	renamed:    sdk-build/hoa.scope.mxo/Contents/PkgInfo -> sdk-build/hoa.meter~.mxo/Contents/PkgInfo
	modified:   sdk-build/hoa.mirror~.maxhelp
	new file:   sdk-build/hoa.mixerOrder.maxpat
	modified:   sdk-build/hoa.mixer~.maxhelp
	modified:   sdk-build/hoa.play~.maxhelp
	modified:   sdk-build/hoa.plug~.maxhelp
	modified:   sdk-build/hoa.projector~.maxhelp
	modified:   sdk-build/hoa.recomposer~.maxhelp
	deleted:    sdk-build/hoa.reflexion~.maxpat
	modified:   sdk-build/hoa.roomEffect~.maxhelp
	modified:   sdk-build/hoa.rotate~.maxhelp
	modified:   sdk-build/hoa.scope.maxhelp
	deleted:    sdk-build/hoa.scope.mxo/Contents/MacOS/hoa.scope
	new file:   sdk-build/hoa.scope~.maxhelp
	renamed:    hoa.library/Info copy 3.plist -> sdk-build/hoa.scope~.mxo/Contents/Info.plist
	new file:   sdk-build/hoa.scope~.mxo/Contents/PkgInfo
	modified:   sdk-build/hoa.snapshot~.maxpat
	modified:   sdk-build/hoa.stochdelay~.maxhelp
	new file:   sdk-build/hoa.switch~.maxpat
	modified:   sdk-build/hoa.trajectory.maxhelp
	renamed:    hoa.library/Info copy.plist -> sdk-build/hoa.trajectory.mxo/Contents/Info.plist
	new file:   sdk-build/hoa.trajectory.mxo/Contents/MacOS/hoa.trajectory
	new file:   sdk-build/hoa.trajectory.mxo/Contents/PkgInfo
	new file:   sdk-build/hoaLibrary/operators/hoa.!d~.maxpat
	renamed:    sdk-build/hoaLibrary/operators/hoa.~.maxpat -> sdk-build/hoaLibrary/operators/hoa.%~.maxpat
	new file:   sdk-build/hoaLibrary/operators/hoa.-~.maxpat
	new file:   sdk-build/hoaLibrary/operators/hoa.d~.maxpat