task
Merge branch 'master' of https://github.com/michael9/mydemo4l_a.git

Conflicts:
	MobleLib/src/com/cqvip/moblelib/biz/Task.java
Merge branch 'master' of https://github.com/michael9/mydemo4l_a.git