add sockjs and live chat
Merge branch 'master' into chat

Conflicts:
	app/partials/sessioninfo.html
	app/scripts/controllers/session.js
	app/scripts/controllers/sessions.js
	app/views/session.html
fix syntax error and fix sockjs with grunt serve
fix indent and remove unneeded merge file
Update README.md
Merge pull request #3 from Guid75/chat

Add Chat fonctionnality