fix text over green ball and fix delete others
Merge branch 'ty11'
kill login activity
Merge branch 'ty12'