Completing merge which includes the fix for Android Studio 3.0

bin/templates/project/build.gradle

@@ -26,10 +26,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 
@@ -40,7 +40,6 @@ allprojects {
             url "https://maven.google.com"
         }
     }
-
     //This replaces project.properties w.r.t. build settings
     project.ext {
       defaultBuildToolsVersion="25.0.2" //String