add modal file
Merge branch 'ph6_dev' into ph6_review
modify design
Merge branch 'ph6_dev' into ph6_review
modify some point
Merge branch 'ph6_dev' into ph6_review
Merge branch 'ph6_review'
Finish to develop phase6
Merge branch 'master' into ph7_dev2