Merging
Merge branch 'master' of https://github.com/trevorlinton/node-webkit

Conflicts:
	src/shell_content_browser_client.cc