Merge branch 'test'

www/protected/modules/common/controllers/ActivityController.php

@@ -101,8 +101,8 @@ class ActivityController extends O2oBaseController  {
             $this->renderpartial('getCoupon', array(
                 'version' => '2015111601',
                 'signPackage' => $signPackage,
-                'userId' => $userId,
-                'appToken' => $appToken,
+                'userId' => '',
+                'appToken' => '',
                 'coupon_id' => $coupon_id,
             ));
         }