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

Conflicts:
	Max/hoaGain_UI/hoa.gain~.xcodeproj/project.xcworkspace/xcshareddata/hoa.gain~.xccheckout