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

Conflicts:
	Max/dev_hoaMeter3D/Builds/MacOSX/hoaMeter3D.xcodeproj/project.pbxproj