dsdsdsd
kjkj
Merge branch 'master' of https://github.com/VCPoject/VCPServer

Conflicts:
	vcproject/bin/.gitignore
-merge with gal