begin webApp
Merge branch 'master' of https://github.com/bennetto/nodejs-simpleRest

Conflicts:
	app/models/Object.js
	server.js
	webSite/app.js
	webSite/index.html