dsdsdsd
kjkj
-merge with ofer
Merge branch 'master' of https://github.com/VCPoject/VCPServer

Conflicts:
	vcproject/bin/.gitignore
-merge with gal
Merge remote-tracking branch 'origin/master' into Ofer