Merge branch 'master-A'

xwiki-platform-skinx/pom.xml

...in/skinx/SkinFileExtensionPluginApiCompatibilityAspect.aj

...iki/plugin/skinx/AbstractDocumentSkinExtensionPlugin.java

...iki/plugin/skinx/AbstractResourceSkinExtensionPlugin.java

...m/xpn/xwiki/plugin/skinx/AbstractSkinExtensionPlugin.java

...pn/xwiki/plugin/skinx/CssResourceSkinExtensionPlugin.java

...va/com/xpn/xwiki/plugin/skinx/CssSkinExtensionPlugin.java

...om/xpn/xwiki/plugin/skinx/CssSkinFileExtensionPlugin.java

...xpn/xwiki/plugin/skinx/JsResourceSkinExtensionPlugin.java

...ava/com/xpn/xwiki/plugin/skinx/JsSkinExtensionPlugin.java

...com/xpn/xwiki/plugin/skinx/JsSkinFileExtensionPlugin.java

.../java/com/xpn/xwiki/plugin/skinx/LinkExtensionPlugin.java

...va/com/xpn/xwiki/plugin/skinx/SkinExtensionPluginApi.java

...om/xpn/xwiki/plugin/skinx/SkinFileExtensionPluginApi.java

...form-skinx/src/main/java/com/xpn/xwiki/web/JsxAction.java

...form-skinx/src/main/java/com/xpn/xwiki/web/SsxAction.java

.../src/main/java/com/xpn/xwiki/web/sx/AbstractSxAction.java

...kinx/src/main/java/com/xpn/xwiki/web/sx/CssExtension.java

...m-skinx/src/main/java/com/xpn/xwiki/web/sx/Extension.java

...skinx/src/main/java/com/xpn/xwiki/web/sx/JsExtension.java