changes to build.gradle, but pulling from Gunnar.
Fixed conflicts in build.gradle.
Fixing conflicts again.