util
Merge branch 'master' of https://github.com/xfm84/VisualStudio

Conflicts:
	Clip/Clip.cpp