#61 - Upgrade to Scala (2.10.2), AKKA (2.2.1) and Netty (3.7.0.Final)
Bump version 0.3.1
socko over netty 4
socko over netty 4
socko-rest over netty4
socko over netty 4
Merge branch 'netty4' of github.com:thirstycrow/socko into thirstycrow-netty4
Upgraded to sbt 0.13.0
#63 - Restored CharsetUtil.scala so users will not have to reference
Netty.  Restored and ported HttpChunkedFile to Netty 4 so that HTTP
chunk downloads from StaticContentHandler will work.
#63 Adjust test case to cater for random order of duplicate message
#64 - Fix for Firefor sending "Connection: keep-alive, Upgrade" rather
than "Connection: Upgrade" for web socket handshakes
Fix configuration error in Builder example app
Revert "Added comment to clarify that an ActorSystem is an ActorFactory"

This reverts commit 6e2f30354d2354c0fdab81c8345b3bec15dddf65.
Revert "Revert "Added comment to clarify that an ActorSystem is an ActorFactory""

This reverts commit 4553bebfda286e998e6578f122a520900ec17d94.
ignore netbeans files
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore