add dragover animate on dock
Merge branch 'master' of github.com:IbpTeam/demo-webde

Conflicts:
	nw/js/desktop.js
Merge pull request #22 from Tanking-1988/master

add dragover animate on dock -> CannedFish