cors
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
cors token modifications
Merge remote-tracking branch 'upstream/master'
adapter cors support
Merge pull request #86 from patriot1burke/master

cors