OSGi bundle changes.  Move classes to avoid package namespace overlap with Spray bundles.
Add ability for sites to host websocket on same port as web server.
Merge pull request #37 from cowboy129/master

Upgrade spray to 1.3.2-20140428
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'
Merge pull request #36 from topping/pfLogicChange

Add ability for sites to host websocket on same port as web server.
Let WebSocketServerConnection to be actor extendable instead of extend
Actor. Let business decide to mixin any Http behavior.
class HttpServiceActor needs to be a trait to be mixed in.
oops
Fixed test
Need to export all package.
Let SocketIOServerConnection/SocketIOClientConnetion to be actor
extendable instead of extend Actor.
Moved source files under package spray.can.server, spray.can.client, spray.io back to corresponding directories.
Export all spray.* packages.
Incremental version to 0.1.2