Some Bugfixes and some Kotlin that helped fixing the bugs

build.gradle

@@ -5,11 +5,13 @@ configurations.all {
 }
 
 buildscript {
+    ext.kotlin_version = '1.1.3-2'
     repositories {
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
 
         // NOTE: Do not place your application dependencies here; they belong