ocr bla bla
Merge remote-tracking branch 'origin/master'
navigation bug after make payment has been fixed