disapearing platforms, music manager added in resource manager
Merge branch 'Jimmy'
GameObjects serilizing
woops
Merge branch 'sebastian'

Conflicts:
	grief/grief/DisapearingPlatform.h
	grief/grief/map.txt