Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	css/workspace.css
	js/common.js
	js/needList.js
	js/workindex.js
	myDemand.html