updated js origin for oauth testing
merge conflict
merge
added additional param