Merge branch 'master' into notifications

Merged in updates to QuickPhoto/QuickVideo menu items.
Merged in @jamesjhu's comment branch

Conflicts:
	AndroidManifest.xml
	src/org/wordpress/android/ui/MenuDrawerItem.java
	src/org/wordpress/android/ui/WPActionBarActivity.java
	src/org/wordpress/android/ui/posts/PostsActivity.java