Merge remote-tracking branch 'origin/7.x-1.x' into 7.x-1.x

Conflicts:
	CHANGELOG.txt

CHANGELOG.txt

+Pending
+----------------------------
+- Media: updated to 7.x-2.0-beta1, removed obviated patches.
+- OCIO Media: Added left, right, and max width media styles for images and videos.
+- OCIO Omega Base: Added SASS mixin to generatie media style CSS, fixed image captions.
+- OCIO Omega Base: Added four-column tiles panels layout. 
+
+
 WCM Base 7.x-1.x, 2015-07-27
 ----------------------------
-- OCIO WYSIWYG: Added 'Tagline', 'Subhead', 'Intro Text', and 'Callout' text styles. 
-- OCIO Landing Page: Added 'Pre-Footer Banner Photo' field. 
-- OCIO Omega Base: Added 'Flip-Flop' panels layout. 
+- OCIO WYSIWYG: Added 'Tagline', 'Subhead', 'Intro Text', and 'Callout' text styles.
+- OCIO Landing Page: Added 'Pre-Footer Banner Photo' field.
+- OCIO Omega Base: Added 'Flip-Flop' panels layout.
 
 WCM Base 7.x-1.x, 2015-07-23
 ----------------------------
-- OCIO Omega Base: Added two new panels layouts. 
+- OCIO Omega Base: Added two new panels layouts.
 
 WCM Base 7.x-1.x, 2015-07-20
 ----------------------------

wcm_base.make

@@ -41,13 +41,11 @@ projects[features_extra][subdir] = contrib
 projects[fieldable_panels_panes][version] = 1.6
 projects[fieldable_panels_panes][subdir] = contrib
 
-projects[media][version] = 2.0-alpha4
+projects[media][version] = 2.0-beta1
 projects[media][subdir] = contrib
 projects[media][patch][2093435] = http://drupal.org/files/issues/media-js-dialog-issues-2093435-21.patch
-projects[media][patch][2126697] = http://drupal.org/files/issues/media_wysiwyg_2126697-53.patch
-projects[media][patch][2308487] = http://drupal.org/files/issues/media-alt_and_title_double-2308487-16.patch
+projects[media][patch][2308487] = http://drupal.org/files/issues/media-alt_and_title_double-2308487-9.patch
 projects[media][patch][2084287] = http://drupal.org/files/issues/media-file-name-focus-2084287-2.patch
-projects[media][patch][2421589] = http://drupal.org/files/issues/media-library-preview-overflow-2421589-3.patch
 
 projects[navbar][version] = 1.5
 projects[navbar][subdir] = contrib