Added ability to save and load xml file from file menu. Needs a restart after load at the moment for the changes to be visible.
enum file for messages from view to controller
Editable TaskItemView window
Edit and Delete Task on Progress
Edit Task
deleted
fixed conflicts
Merge branch 'master'
new db
Merge branch 'master'
Merge branch 'master-3'
Merge branch 'Aries4'
db file new
Merge branch 'master-6'
Fixed theme stuff
db
Merge branch 'Pontus2'

Conflicts:
	Code/src/TimeManager/TimeManagerView.java
Merge remote-tracking branch 'origin/master' into Sercan