pull merge
Merge branch 'master' of github.com:IbpTeam/demo-webde

Conflicts:
	nw/js/desktop.js
Merge pull request #37 from CannedFish/dentry

add multi-entry move || add a multi-entry selector  ---> Tanking-1988
add property show icon and add context menu disable item and fix some bugs
convert old file jquery.js
fix conflicts
Merge pull request #38 from Tanking-1988/master

add property show icon and add context menu disable item and fix some bugs -> CannedFish
fix drag dock app and plugin
Merge branch 'master' of github.com:IbpTeam/demo-webde
Merge pull request #40 from Tanking-1988/master

fix drag dock app and plugin -> CannedFish
merge branch 'dentry' into master
add a dialog addon