Screenshare stuff
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular into feature/60-screenshare
stuff
Fix adding modal
Merge branch 'feature/60-screenshare'