Merge with remote

Author: hitherejoe

Code_Quality/quality.gradle

@@ -35,7 +35,7 @@ task findbugs(type: FindBugs,
     effort = "max"
     reportLevel = "high"
     excludeFilter = new File("$qualityConfigDir/findbugs/android-exclude-filter.xml")
-    classes = files("$project.rootDir/app/build/intermediates/classes")
+    classes = files("$project.rootDir/buffer-android-app/build/intermediates/classes")
 
     source 'src'
     include '**/*.java'
@@ -75,4 +75,4 @@ task pmd(type: Pmd, group: 'Verification', description: 'Inspect sourcecode for
             destination "$reportsDir/pmd/pmd.html"
         }
     }
-}
+}

README.md

@@ -3,12 +3,19 @@
 
 Welcome to the Android Guidelines repo 👋 
 
-This repository is used to house all of our project guidelines for the Buffer App on the Android Platform.
+This repository is used to house all of our project guidelines for the Buffer App on the Android Platform.  
+  
+Here you'll find:
+
+1. [Code Quality](/Code_Quality)  
+  * [CheckStyle Configuration](/Code_Quality/checkstyle)  
+  * [FindBugs Configuration](/Code_Quality/findbugs)  
+  * [PMD Configuration](/Code_Quality/pmd)  
 
 ##Licence
 
 ```
-Copyright 2016 Buffer Ltd.
+Copyright 2016 Buffer, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,4 +28,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-```
+```

licence

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2015 Buffer Ltd.
+   Copyright 2015 Buffer, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.