Merge branch 'master' into Write-the-first-failing-test

Conflicts:
	.gitignore
	build.gradle
Merge changes