Add or setting to approval flow
Merge branch 'kanety-approval'
Update schema
Merge branch 'master' of github.com:ozamasa/zomeki-development