design laucher page
finish laucher Page
Merge branch 'feature-laucher' into develop
modify merge conflict