FIX zzz
Merge remote-tracking branch 'origin/master' into Sebastian

Conflicts:
	grief/grief/Map.cpp
	grief/grief/main.cpp

omgomgomg, conflicts fixed
liek aaaaaaaaaaaaaaaw
Editor is RelativeTo window