Have the websocket at hostname

Probably no one will have the websocket somewhere else ...
Merge branch 'master' into websocket_at_hostname

Conflicts:
	README.md
	js/main.js
Merge pull request #5 from owncloud/websocket_at_hostname

Have the websocket at hostname