Syncing with dev branch

includes/admin/admin.php

@@ -35,6 +35,7 @@ function trestle_custom_defaults( $defaults ) {
 		'trestle_layout'                => 'solid',
 		'trestle_logo_url'              => '',
 		'trestle_logo_url_mobile'       => '',
+		'trestle_favicon_url'           => '',
 		'trestle_nav_primary_location'  => 'full',
 		'trestle_read_more_text'        => __( 'Read More »', 'trestle' ),
 		'trestle_revisions_number'      => 3,
@@ -94,6 +95,12 @@ function trestle_register_required_plugins() {
 			'required' 	=> false,
 		),
 
+		array(
+			'name' 		=> 'Equal Height Columns',
+			'slug' 		=> 'equal-height-columns',
+			'required' 	=> false,
+		),
+
 		array(
 			'name' 		=> 'Events Manager',
 			'slug' 		=> 'events-manager',
@@ -113,8 +120,8 @@ function trestle_register_required_plugins() {
 		),
 
 		array(
-			'name' 		=> 'FancyBox for WordPress',
-			'slug' 		=> 'fancybox-for-wordpress',
+			'name' 		=> 'Easy FancyBox',
+			'slug' 		=> 'easy-fancybox',
 			'required'  => false,
 		),
 
@@ -257,4 +264,4 @@ function trestle_register_required_plugins() {
 	);
 
 	tgmpa( $plugins, $config );
-}
+}