modified bill's todo list
Merge branch 'develop' into bill