Parallax
Merge branch 'Sebastian'

Conflicts:
	grief/grief/grief.vcxproj.filters