changed connection host and port
changed controller style
rolled back changes
Merge branch 'master' of https://github.com/HRR1-ddgz/webrtc

Conflicts:
	client/components/socket/socket.service.js
Merge branch 'master' of https://github.com/HRR1-ddgz/webrtc
updated from master
Merge branch 'master' of https://github.com/HRR1-ddgz/webrtc
added / to chat on line 4
Merge pull request #53 from dscx/master

chat fix