细微修改
Merge branch 'master' of https://github.com/tkpclark/tinker

Conflicts:
	src/base/applist.cpp