Fixed "CE8 in two weeks" bug
Merge branch 'master' of https://github.com/yjlo123/todo

Conflicts:
	todo.xml