manual merge of #303
manual merge of #304
fix for #301, headers being URI encoded
fixed merge issue
added resource description
added custom getty js