Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/androidTest/java/com/appttude/h_mal/easycc/MainActivityTest.java

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: circleci/android:api-26-alpha
+      - image: circleci/android:api-27-alpha
     environment:
       JVM_OPTS: -Xmx3200m
     steps:
@@ -21,6 +21,8 @@ jobs:
             - ~/.gradle
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
       - run:
+#          name: Run UnitTest
+#          command: ./gradlew ExampleInstrumentedTest
           name: Run Tests
           command: ./gradlew lint test
       - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ 

app/src/main/java/com/appttude/h_mal/easycc/legacy/MainActivityJava.java

@@ -375,4 +375,4 @@ public class MainActivityJava extends AppCompatActivity {
     }
 
 
-}
+}