Merge remote-tracking branch 'origin/master'

Conflicts:
	WorkerManagemetApplication/WorkerManagemetApplication.v11.suo