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

Conflicts:
	nw/js/desktop.js
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