changes in taskdao, layout changed
Merge branch 'master' of https://github.com/mwagnurr/ToDoMorrow

Conflicts:
	res/layout/activity_task_list.xml
	src/com/lnu/todomorrow/dao/TaskDAO.java