= build: add CONTRIBUTING.md to show in github pull requests
= servlet: fix configuration loading
= servlet: check `settings` for null before using it
! httpx: move unmarshal and unmarshalUnsafe to Unmarshaller and add unmarshaller method

This fixes #373 by moving the `unmarshal` and `unmarshalUnsafe` methods from the spray.httpx package object to the Unmarshaller object. It also renames `unmarshal` to `unmarshaller` and adds an improved version of `unmarshal`that takes an `HttpEntity` as a parameter, making it consistent with `unmarshalUnsafe`

Added the necessary unit tests to `BasicUnmarshallers`.
Merge pull request #377 from agemooij/issue-373

Fix for Issue 373
Merge pull request #388 from cppexpert/master

spray-servlet always crashes on start because it cannot find config "spray.servlet"
! httpx: decode should remove Content-Encoding header from message

This fixes #316 by changing Decoder.decode to remove the Content-Encoding header.

I added extra round-trip unit tests to the DeflateSpec and GzipSpec but I also added some basic unit tests for the Encoder and Decoder abstract classes themselves.
Merge pull request #385 from agemooij/issue-316

Fix for #316: ! httpx: decode should remove Content-Encoding header from message
= docs: fix type on the magnet pattern post
Merge branch 'master' into release/1.1
= httpx: homogenize Decoder and Encoder header testing/filtering
Merge branch 'master' into release/1.1