fix db migration
Merge branch 'selfsignup' into onlinepay
Merge branch 'onlinepay' into foodcoop-adam-new