Fix build.gradle including files twice
Merge remote-tracking branch 'origin/master'