Merge branch 'hotfix/creationsbug'
payment bug case insensative OSX
Merge branch 'hotfix/payments' into develop