Add support for merchant_order_id. Closes #1
Merge remote-tracking branch 'upstream/master'
add netbeans & phpstorm to gitignore