turned off abortOnError in build.gradle
working on build configuration
Merge branch 'origin/master'