Update README.md
Update README.md
Update README.md
Merge branch 'master' into feature/quint/gradle

Conflicts:
	README.md