Add test data
Revert "Add test data"

This reverts commit c930d6856e5d53bc94f30b64d06a6c9efb56af85.
Add test data
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	core/app/common/task/TaskManagerImpl.java