Updated TODO list.
Merge branch 'development'