Merge origin/master

Conflicts:
	todo.xlsx
Desktop version
Merge origin/master