Merge branch 'dev' into test

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