Merge branch 'develop' into issue/1402-cache-jetpack-user-email

# Conflicts:
#	fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.java

Author: anitaa1990

example/src/test/java/org/wordpress/android/fluxc/SingleStoreWellSqlConfigForTests.java

@@ -50,6 +50,7 @@ public void onCreate(SQLiteDatabase db, WellTableManager helper) {
     /**
      * Drop and create all tables
      */
+    @Override
     public void reset() {
         SQLiteDatabase db = WellSql.giveMeWritableDb();
         for (Class<? extends Identifiable> clazz : mStoreClassList) {