fix #1813: quick fix - waiting for a wpactionbar/menudrawer rewrite for a better fix
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
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