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

Conflicts:
	WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java

Author: nbradbury