akka/akka — pull request #16196 by jrudolph (2014-10-31 13:30:10+00:00)
Title: +htp #15922 import FileAndResourceDirectives from spray

Based on #16183 + #16195. So, please review just the last commit. I will rebase once the other PRs are merged.

Fixes #15922.

/cc @sirthias @hseeberger