Memory class refactoring.
Merge branch 'master' of https://github.com/Ant2i/FRE4

Conflicts:
	Dev/Source/Test/main.cpp