Merge branch 'release/0.2.0'
Fix a few bugs in the paytrail controller
Merge branch 'hotfix/0.2.1' into develop