Minor changes
Merge branch 'master' of github.com:fbatta/wbox-nodejs

Conflicts:
	app.js