Merge branch 'SidneyFan' into version2.3
Bar bugs

index=0
Merge branch 'version3.0' into MaggieHe
Controller Update

add close action and update dictionary
Merge branch 'MaggieHe' into version3.0
UI BUG
Merge branch 'version3.0' into SidneyFan