Merge branch 'master' of git@github.com:lishangqiang/robots.git

Conflicts:
	robotsapp/upload_workers.py
Merge branch 'master' of github.com:lishangqiang/robots

Conflicts:
	robotsapp/upload_workers.py