GameObjects serilizing
woops
Merge branch 'sebastian'

Conflicts:
	grief/grief/DisapearingPlatform.h
	grief/grief/map.txt
added files
Merge branch 'master' into Anton

Conflicts:
	grief/grief/Camera.h
	grief/grief/PlatformSerializer.cpp
	grief/grief/grief.vcxproj.filters
	grief/grief/main.cpp
	grief/grief/map.txt
man a give
apa
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/map.txt
Merge branch 'Jimmy'

Conflicts:
	grief/grief/map.txt
apa
Merge branch 'Sebastian'
Merge branch 'master' of https://github.com/adeadrat/Grief
Merge branch 'master' into Anton
filterfix
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/grief.vcxproj.filters
fix