ui/main_activity
ui/main_activity
Merge remote-tracking branch 'cri/develop' into feature/ui/main_acitivty