rootController, loginController, roomController
Merge branch 'master' of https://github.com/fabrice123/Backend_sails

Conflicts:
	Backend_project/Gruntfile.js
	Backend_project/package.json
	Backend_project/views/layout.ejs