commit by user2
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	src/pack/MysqlConnect.java