waypoint ckin
Merge branch 'master' of github.com:onlyuser/dexvt-test

Conflicts:
	src/ShaderContext.cpp