Merge branch 'version3.0' into SidneyFan
Merge branch 'version3.0' into MaggieHe
Controller Test
Merge branch 'MaggieHe' into version3.0
Code Reconstruction
Merge branch 'SidneyFan' into version3.0
Merge branch 'ArielQian' into version3.0
Merge branch 'version3.0' into ArielQian