#463 changes to support better secure socket.io
#463 progress with onlySecure
#463 fixed tests.
Merge branch 'develop' into feature/#463

Conflicts:
	lib/webserver/index.js
#470 Finish #463

Conflicts:
	lib/webserver/index.js