Updated todo list - removed one item and added one item
Merge branch 'master' into iridis