add x-api-user and x-api-key to accpeted headers
Merge branch 'origin-develop'