Changed references to $merchantToken to $merchantId
Merge remote-tracking branch 'origin/master' into release
div not in html in docs.
comers missing from php array