Merge branch 'version1.0' into MaggieHe
Controllers Finished

RootDelegate, ReciteProcessController and RecordController finished
Test Comment Finished

test merge
Merge branch 'MaggieHe' into version2.1
Merge branch 'version2.1' into SidneyFan