Squashed commit of the following:

commit 6da8892f8d5c1c390ede6812d36fed85ddda74a6
Author: Marcel Soute <m.soute@gmail.com>
Date:   Wed Aug 7 16:08:34 2013 +0200

    Change property names

commit 3093ce02b63626ec1767f99a76234692c2408fa6
Author: Marcel Soute <m.soute@gmail.com>
Date:   Wed Aug 7 15:05:26 2013 +0200

    Add basic authorization to HttpResolution

commit 6b9d94914e05e92de1083f152ee60c8c2b0ad2dd
Author: Marcel Soute <m.soute@gmail.com>
Date:   Wed Aug 7 15:03:20 2013 +0200

    Add basic authorization to HttpResolution