commit
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/map.txt
Merge branch 'master' of https://github.com/adeadrat/Grief
To shared_ptr!
objectmanager
Merge branch 'master' into sebastian
sharedptr
PlatformSerializer
Merge branch 'master' into Jimmy

Conflicts:
	grief/grief/Guihelp.cpp
	grief/grief/grief.vcxproj.filters
	grief/grief/main.cpp
	grief/grief/map.txt