jucebox start
Merge branch 'master' of https://github.com/CICM/HoaLibrary

Conflicts:
	Max3D/HoaMap/hoa.map3D~.xcodeproj/project.xcworkspace/xcshareddata/hoa.map3D~.xccheckout
	Max3D/builds/_leapmotion.maxhelp
	Max3D/builds/hoa.map3D~.mxo/Contents/MacOS/hoa.map3D~