[DEV] Add default view
Merge remote-tracking branch 'origin/dev-new_new_ui-branch' into thomasBranch
[DEV] Add scrollview
Merge remote-tracking branch 'origin/dev-new_new_ui-branch' into thomasBranch
[DEV] Refactor main
Update images
Merge remote-tracking branch 'origin/dev-new_new_ui-branch' into thomasBranch
[DEV] change color
fix some xmls
Merge remote-tracking branch 'origin/dev-new_new_ui-branch' into thomasBranch