minus recomposer + line
Merge branch 'master' of https://github.com/CICM/HoaLibrary

Conflicts:
	Sources/Hoa2D/Hoa2D.h