Merge remote-tracking branch 'origin/gal1'
Merge branch 'master' of https://github.com/VCPoject/vcproject.git