kelink

修改HistoryActivity里面的更新操作，修改了模板内相对应的命名和C.java 新增加任务ID
Merge branch 'master' of https://github.com/yinchuandong/Library

Conflicts:
	bin/Library.apk
	bin/classes.dex
	bin/resources.ap_