Marco, madde magnus
Merge branch 'master' of https://github.com/kankoli/to-do-manager.git

Conflicts:
	todo_53V3N/bin/control/ControllerInterface$ActionName.class
	todo_53V3N/bin/control/ControllerInterface.class
	todo_53V3N/bin/control/DataController.class
	todo_53V3N/bin/model/DataModel$1.class
	todo_53V3N/bin/model/DataModel.class
	todo_53V3N/bin/view/main_window/TaskRow$1.class
	todo_53V3N/bin/view/main_window/TaskRow$2.class
	todo_53V3N/bin/view/main_window/TaskRow$3.class
	todo_53V3N/bin/view/main_window/TaskRow$4.class
	todo_53V3N/bin/view/main_window/TaskRow$5.class
	todo_53V3N/bin/view/main_window/TaskRow.class
	todo_53V3N/bin/view/main_window/TaskScrollPanel.class
	todo_53V3N/bin/view/main_window/ToDoMainFrame.class
	todo_53V3N/bin/view/main_window/ToDoMainMiddlePanel.class
	todo_53V3N/bin/view/main_window/ToDoSortingBar$sortingBarMouseListener.class
	todo_53V3N/bin/view/main_window/ToDoSortingBar.class
	todo_53V3N/config.properties
	todo_53V3N/src/view/main_window/TaskRow.java
	todo_53V3N/src/view/main_window/ToDoMainMiddlePanel.java
	todo_53V3N/src/view/main_window/ToDoSortingBar.java
	todo_53V3N/todoManagerData.xml