add contextMenu and fix bugs
Merge branch 'master' of github.com:IbpTeam/demo-webde

Conflicts:
	nw/css/desktop.css
Merge pull request #25 from Tanking-1988/master

add contextMenu -> CannedFish