Merge branch 'develop'

@@ -64,7 +64,7 @@ class Service_News extends Lib_Service
            $tag = addslashes($tag);
            $where = '`tag` like ("'.$tag.'%")' ;
        }
-       $where = ' WHERE '.$where .' AND '.$exceptWhere;
+       $where = ' WHERE '.$where .' OR is_video=1 AND '.$exceptWhere;
        return self::service(self::ROUTER)->tag(self::$_tag)->fetchOne('getTotal', array(),array('where' => $where));
     }