Signed-off-by: dwt1987 <dwt1987@163.com>
Merge branch 'HEAD' of https://github.com/MonsterStorm/TQM

Conflicts:
	bin/jarlist.cache

Signed-off-by: dwt1987 <dwt1987@163.com>