Map edit yo
Merge remote-tracking branch 'origin/dev-new' into dev-new

Conflicts:
	Test/main.cpp