Merge branch 'master' of https://github.com/sxhsxy/demospace

Conflicts:
	js/treeDialogSelect.js

..

amend

amend
Merge branch 'master' of https://github.com/sxhsxy/demospace