Fixed bug when trying to save credit card using the RESTFul API and other minor changes
Merge branch 'work'