Merge pull request #405 from patriot1burke/master

redirect uris not required with bearer only
Fix config for folder theme provider£
Merge pull request #406 from stianst/master

Fix config for folder theme provider£
Merge remote-tracking branch 'upstream/master'