更新gettype和李奇文件
Merge remote-tracking branch 'origin/master'

Conflicts:
	MrDAP/js/task.js