merge
Merge branch 'master' of https://github.com/XIONG-WEN/NewMJProject

Conflicts:
	FaSTart/src/cn/fastek/fastart/utils/MJUtil.java