Update TODO list
Fix Markdown on TODO list
Merge branch 'master' into edit-profile