Merge branch 'develop' of github.com:wordpress-mobile/WordPress-iOS into feature/ios7-themes

Conflicts:
	WordPress/Classes/MP6SidebarViewController.m
	WordPress/WordPress.xcodeproj/project.pbxproj
Fix errors and add WPStyleGuide method
Remove gallery icon
Add media icon for blog menu option
Add themes icon for blog menu

- Readd icons due to project file corruption
Simplified search and remove reloads
Add sort button for themes

- Fix rotate crash with UICollectionView header space defined but no header — made search bar the header

- Prevent stacking popovers on iPad

- Resize search bar properly, disregarding initial nib width.
Maintain current search after refresh
Merge branch 'feature/ios7-themes' into feature/ios7-media-library

Conflicts:
	WordPress/Classes/BlogDetailsViewController.m
	WordPress/Classes/ThemeBrowserViewController.m
	WordPress/WordPress.xcodeproj/project.pbxproj