fix merchant to api for $application_folder
callback almost implemented, other RPC functions done.
updated gitignore
Merge remote-tracking branch 'origin/master'