improve gui
improvement
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	data/lang/fa_ir.xml
	data/reference/rule/convertrule.xml
	src/base/classification/EntityClassifier.java
	src/base/util/Detail.java