Update chat
erge branch 'master' of https://github.com/Educ8-2014/educ8-angular into feature/61-chat

Conflicts:
	app/modules/socket/socket_service.js
Add changes to chat and update video button to dissapear on connection ready
Merge branch 'feature/61-chat'
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular