merge
Revert "Merge pull request #25 from MikeMatrix/GAIA-Patch-3"

This reverts commit c6382f3f49451cb81e96265ff92c82eb70da6cd0, reversing
changes made to 7b1f531ec7255ef5d7a612eb59a525f4fbd6c00b.

Conflicts:
	defines.hpp
Fixed defines