no message
no message
Merge branch 'bugfix-major_2' into develop

Conflicts:
	src/jchess/JChessTabbedPane.java