Modification in settings.gradle, changed rootProject.name
Merge branch 'master' into configured-by-xml