testing commit

commit
Merge branch 'master' of https://github.com/GravityInnovations/tasks.done.android

Conflicts:
	trunk/Android Workspace/.metadata/.mylyn/tasks.xml.zip
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/tasks.done/.markers.snap
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/tasks.done/.syncinfo.snap
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.core.resources/.snap
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.jdt.core/3302560219.index
	trunk/Android
Workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml