welcome screen more elements
merge
Merge branch 'shengzhc' into dev
update TODO
merge