SAT
Merge branch 'master' of https://github.com/Lolilolight/ODFAEG

Conflicts:
	src/odfaeg/Graphics/2D/map.cpp