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
ResourceManager load/save-file + Class Diagram
Class Diagram
Merge remote-tracking branch 'origin/Sebastian'
Merge branch 'jimmy'

Conflicts:
	grief/grief/map.txt