Merge branch 'hotfix/0.1.3'
Move success and failure urls to payment manager and add payment controller
Merge branch 'hotfix/0.1.4' into develop