ported changes to latest nw (even though graphics are slower)
Merge branch 'master' of https://github.com/excellent-media/node-webkit into HEAD