Implement trying to connect with wss , and then failsafe to ws if wss
doesn't work
changes to web.xml to accept https requests
Merge remote-tracking branch 'origin/firewall' into livetsl

Conflicts:
	src/main/webapp/js/GEPPETTO.Main.js