Merge branch 'master' into qa

views/co/admin.php

@@ -11,7 +11,7 @@ HtmlHelper::registerCssAndScriptsFiles($cssJS, Yii::app()->getModule( Yii::app()
 	#content-view-admin, #goBackToHome{
 		display: none;
 	}
-	#content-social{
+	#search-content{
 		min-height:700px;
 		background-color: white;
 	}
@@ -20,7 +20,7 @@ HtmlHelper::registerCssAndScriptsFiles($cssJS, Yii::app()->getModule( Yii::app()
 	}
 </style>
 
-<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding" id="content-social">
+<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding" id="search-content">
 <?php 
 
 if( Form::canAdmin((string)$form["_id"], $form) ||