renamed room to roomName and name to userName in frontend and backend, made notifycontent change, changecontent,upload
Merge branch 'master' of https://github.com/fabrice123/Backend_sails

Conflicts:
	Backend_project/api/controllers/ChatController.js
	Backend_project/api/controllers/RoomController.js
	Backend_project/views/layout.ejs