fix #1813: quick fix - waiting for a wpactionbar/menudrawer rewrite for a better fix
Merge branch 'hotfix/3.1.1' into release/3.2
Merge pull request #1825 from wordpress-mobile/issue/1813-npe-wpactionbar

fix #1813: quick fix - waiting for a wpactionbar/menudrawer rewrite for a better fix
Like icon now reverses its rotation
Merge pull request #1828 from wordpress-mobile/issue/1817-like-animation

Like icon now reverses its rotation
Merge branch 'hotfix/3.1.1' into release/3.2

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java
Merge branch 'release/3.2' of github.com:wordpress-mobile/WordPress-Android into release/3.2
Merge branch 'release/3.2' into develop
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 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/1832-blog-detail