Use client redirect instead of server and fixes#36

grekinsky wants to merge 5 commits intomastertokenio/merchant-sample-java:masterfrom

RD-2010tokenio/merchant-sample-java:RD-2010Copy head branch name to clipboard