taskView
Merge branch 'master' of https://github.com/alexBeuth/whatsToDo.git

Conflicts:
	WhatsToDo/res/layout/listitem.xml
	WhatsToDo/src/com/whatstodo/list/ListActivity.java