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

Conflicts:
	src/vcproject/VCP_Main_Frame.java
zhjkdsadkjkjadhs