Resolve branch/node merge conflict
Merge branch 'branch/node' of http://github.com/virtual-world-framework/vwf into branch/node