Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-add-item

# Conflicts:
#	libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java

Author: daniloercoli

WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java

@@ -16,7 +16,8 @@
 public class AppLog {
     // T for Tag
     public enum T {READER, EDITOR, MEDIA, NUX, API, STATS, UTILS, NOTIFS, DB, POSTS, COMMENTS, THEMES, TESTS, PROFILING,
-        SIMPERIUM, SUGGESTION, MAIN, PLANS}
+        SIMPERIUM, SUGGESTION, MAIN, SETTINGS, PLANS}
+
     public static final String TAG = "WordPress";
     public static final int HEADER_LINE_COUNT = 2;