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

Conflicts:
	src/main/webapp/js/GEPPETTO.Main.js
Merge pull request #100 from openworm/master

Release 0.1.3
Merge pull request #104 from openworm/master

Release 0.1.4
Merge pull request #107 from openworm/master

Reverting accidental commit
Merge pull request #116 from openworm/master

Release 0.1.5
Merge pull request #130 from openworm/master

Release 0.1.6
Merge pull request #134 from openworm/master

Release 0.1.6
Merge pull request #138 from openworm/master

Fixes for release
Merge pull request #161 from openworm/master

Release 0.1.7
Merge pull request #175 from openworm/master

Release 0.1.8
Merge pull request #183 from openworm/livetsl

Master -> Livetsl