transfert
Merge branch 'master' of https://github.com/LondNoir/Emeraude-Engine

Conflicts:
	src/Libs/PixelFactory/PrintablePixmap.Glyph.cpp
	src/Libs/PixelFactory/PrintablePixmap.Row.cpp
	src/Libs/PixelFactory/PrintablePixmap.hpp