Merge branch 'version3.0' into ArielQian
Merge branch 'version3.0' into MaggieHe
Controller Test
Merge branch 'MaggieHe' into version3.0
Merge branch 'SidneyFan' into version3.0
Refactor the code

Refactor the code and modify the comments
Refactor the code

Change some comments and refactor
Merge branch 'ArielQian' into version3.0
Merge branch 'SidneyFan' into version3.0
Frame Margin
Merge branch 'version3.0' into SidneyFan