-not important
Merge remote-tracking branch 'origin/gal'

Conflicts:
	vcproject/src/controler/LogIn_controller.java
	vcproject/src/gui/VCP_Main_Frame.java