rebase fix for windows
fix for tray
Merge windows with Linux

Conflicts:
	nw.gypi
add lost files for tray
merge Linux and Windows fixes