split user and admin app
Merge remote-tracking branch 'mannix/master'
merge mannix code feb 26
prepare stripe checkout
Merge remote-tracking branch 'mannix/master'
upgrade billing system
merge mannix code march-01
S Mrg