added error object for webrtc and video requests
Merge branch 'master' of github.com:HRR1-ddgz/webrtc into no-video

Conflicts:
	client/app/rooms/rooms.controller.js
	client/components/socket/webrtc.service.js
changed name to main
Merge pull request #49 from dscx/master

changed name on main page
added error handling to webrtc service for unsupported or denied permission requests
Merge branch 'master' of github.com:HRR1-ddgz/webrtc into no-video
merged seperate socket.ios into one with different namespaces for chats and rooms. Set chat controller as a controller on the main angular app. removed ng-app directive from rooms.html chat-container div
Merge pull request #50 from Gabs00/no-video

No video, fixed chat
merge gabar's chat changes