Removed aggressive `JSONUtil` logging
Merge branch 'develop' into feature/notifications-redesign

Conflicts:
	WordPress/src/main/java/org/wordpress/android/WordPress.java
	WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java
	WordPress/src/main/java/org/wordpress/android/ui/notifications/FollowRow.java
	WordPress/src/main/res/values/strings.xml
Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance
Merge branch 'develop' into feature/notifications-redesign

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/notifications/BigBadgeFragment.java
Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"

This reverts commit 0c5bd2d2a9102f6232dd8be2c7d188478adf096a, reversing
changes made to 083a2727309e034a824f88c47b6ad1e7b83145ab.
Merge branch 'release/3.2' into feature/notifications-redesign
remove isTablet() check
Merge branch 'hotfix/3.1.1' into develop
Merge branch 'hotfix/3.1.1' into release/3.2
Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments""

This reverts commit 6936da153fe0887cdc0e240ffc2ab22ca7cb5a4a.

Conflicts:
	WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java
Merge branch 'release/3.2' into feature/notifications-redesign

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java
	WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java
Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null
fix #1821: remove DisplayUtis.isTablet() method
Merge branch 'hotfix/3.1.2' into release/3.2

Conflicts:
	WordPress/src/main/java/org/wordpress/android/GCMIntentService.java
Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet

fix #1821: remove DisplayUtis.isTablet() method
Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign

Notifications redesign
Merge branch 'release/3.2' into develop
fix debug/release build propagation to sub projects
Merge branch 'release/3.2' into develop