Fixed vidoe chat
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular into feature/58-video
Update sockets service for https and add screenshare startup
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular into feature/58-video

Conflicts:
	app/styles/global.scss
Merge branch 'feature/58-video'
Remove .ds_stores