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

Conflicts:
	Max6/hoaScope_UI/hoa.scope~.cpp