renamed merchant app to API, lots of new functionalities
Merge remote-tracking branch 'origin/master'