todoItem move to MVC
Partially reverted latest merge
Merge remote-tracking branch 'origin/master'