Stuff
Delete Todo-Manager.pro.user
Merge remote-tracking branch 'origin/georg'

Conflicts:
	Classes/taskconnector.h