...
....
Merge remote-tracking branch 'github/master'

Conflicts:
	src/com/nju/se/team/mota/game/LogoPanel.java
	src/com/nju/se/team/mota/game/SaveListPanel.java