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