updating lotus
Merge branch 'update-lotus' of https://github.com/bitboxer/ToDoApp into bitboxer-update-lotus

Conflicts:
	test.db
Merge branch 'bitboxer-update-lotus'