merge
Merge commit '51e621fc6d5a1de5e2cf12e91a1144fb058cd890' into Ben's_branch
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch
worked on bugs
Merge commit 'dd052f04209c3cd00f6b1040de4b251892b4dbeb' into Ben's_branch
Merge commit '5ab2ace27fe54b0f649faafc176fb9aa7205fc42' into Ben's_branch
Merge commit 'e70582a1efbfd60e18657f001781c3c78dd5789e' into Ben's_branch

Conflicts:
	src/todologApp/CommandView.java
	src/todologApp/UserInterface.java
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch
fix pageup and pagedown, set application in the center, got rid of words "by" and "with"
Merge commit '26b71c80fc91c9ce07b43eecb6bb39fbcab448ad' into vani's_branch

Conflicts:
	src/todologApp/CommandView.java
draggable UI
Reverse wrong merge action for CommandView
changing the deletecommand
changed commandEdit not complete
View should stay there until another CommandView/CommandSearch is execute
changed for the view
Merge commit 'd2436df7f2dcfc5002f84dff06ab6e20e6cad527' into vani's_branch
changed MarkAsDone for the different views
fixed bug for delete and changed commandSearch for view