Merge branch 'master' of https://github.com/VCPoject/vcproject.git

Conflicts:
	src/gui/CheckInOut_Frame.java
	src/gui/LogIn_Frame.java
	src/gui/LogIn_Panel.java
	src/gui/Main_Panel.java
	src/gui/VCP_Main_Frame.java
	src/gui/VCP_Main_Frame.java.orig
Merge remote-tracking branch 'origin/gal1'
Merge remote-tracking branch 'origin/gal1'
Merge remote-tracking branch 'origin/gal1'
Merge branch 'master' of https://github.com/VCPoject/vcproject.git
Merge branch 'master' of https://github.com/VCPoject/vcproject.git