Build fix
Merge branch 'master' of https://github.com/CycleDev/ToDo-List-Desktop

Conflicts:
	.idea/workspace.xml
	ToDo-List-Desktop.iml
	src/main/java/nao/cycledev/todolist/desk/model/Project.java