eow today
Merge branch 'master' of https://github.com/man-at-home/totask2.git

Conflicts:
	build.gradle