Merge branch 'hotfix/0.1.2'
Fix payment gateway events
Move order identifier to transaction
Merge branch 'hotfix/0.1.3' into develop