Merge branch 'master' into notragoraV2

ApiModule.php

@@ -79,6 +79,10 @@ class ApiModule extends CWebModule
 			return false;
 	}
 	private $_assetsUrl;
+	public function getParentAssetsUrl()
+	{
+		return ( @Yii::app()->params["module"]["parent"] ) ?  Yii::app()->getModule( Yii::app()->params["module"]["parent"] )->getAssetsUrl()  : self::getAssetsUrl();
+	}
 	
 	public function getAssetsUrl()
 	{