Beautify VS solution
Merge branch 'master' of https://github.com/Eyescale/Buildyard
Merge branch 'master' of https://github.com/Eyescale/Buildyard

Conflicts:
	CMake/UseExternal.cmake