シンプルなほうがいい
replace import open.dolphin.infomodel.*
Merge origin/master

Conflicts:
	client/src/main/java/open/dolphin/client/ChartEventListener.java
Merge origin/master