updated controller to work with ViewTodo ,profile
Merge remote-tracking branch 'origin/master' into sham_branch