submit
添加字体图标
Merge branch 'master' of https://github.com/XSoftlab/XSoftlab.git

Conflicts:
	X-Android/src/net/xsoftlab/app/MainFragment.java