Signed-off-by: WEN GUO <wandergogogo@gmail.com>
Merge branch 'master' of https://github.com/WenGuo571/Shogi

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	src/org/shogi/client/Presenter.java
	src/org/shogi/client/StateExplorerIml.java
	src/org/shogi/graphics/Graphics.java
	src/org/shogi/graphics/ShogiCss.java
	src/org/shogi/graphics/ShogiEntryPoint.java