QR Activity
Welcome activity
Merge branch 'feature/flow' into develop