Update TO-DO List
Merge branch 'shengzhc' into dev
merge
merge
updating TODO