Merge branch 'master' of https://github.com/zanpen2000/TaskFramework into peng-master

Conflicts:
	TaskFramework.Lib/ParallelTaskQueue.cs
	TaskFramework.Lib/SimpleParallelTask.cs