fix todo list version confliction control
Merge branch 'master' of https://github.com/mochaware/HelloAspAngular.git