travis
Clean up lint warnings
Merge branch 'master' into mburton/ormlite

Conflicts:
	Tasks/src/main/res/values/strings.xml