OSGi bundle changes.  Move classes to avoid package namespace overlap with Spray bundles.
Merge branch 'master' of github.com:topping/spray-websocket into topping-master

Conflicts:
	spray-websocket/src/main/scala/spray/can/websocket/client/UpgradableHttpClientSettingsGroup.scala
	spray-websocket/src/main/scala/spray/can/websocket/io/SslTlsSupportV2.scala
	spray-websocket/src/main/scala/spray/can/websocket/server/UpgradableHttpListener.scala
	spray-websocket/src/main/scala/spray/io/SslTlsSupportPatched.scala
	spray-websocket/src/main/scala/spray/io/SslTlsSupportV2.scala
Merge branch 'topping-master'