=doc Update Sphinx installation instructions
=doc,osg Effort to get OSGi integration tests running again

* Update protobuf dependency so mvn clean install runs again
* Bump OSGi version range in AkkaBuild to include current 2.3 for generated manifests
* Update path in dev documentation to correct TexBasic folder
Merge pull request #1817 from sandermak/osgi-sample-improvements

=doc,osg Effort to get OSGi integration tests running again
Merge pull request #1816 from akka/wip-sphinx-patriknw

=doc Update Sphinx installation instructions
=pro #3448 Upgrade to sbt 0.13.0
=all #3448 Newer Scalariform running on more files
Merge pull request #1791 from akka/wip-3448-update-to-sbt-0.13-ban

=pro #3448 Upgrade to sbt 0.13.0
Merge remote-tracking branch: upstream/master