Merge branch 'master' of https://github.com/piwik/piwik

plugins/CorePluginsAdmin/templates/extend.twig

+{% extends 'admin.twig' %}
+
+{% import '@CorePluginsAdmin/macros.twig' as plugins %}
+
+{% block content %}
+    <div style="max-width:980px;">
+
+        <h2>Extend Piwik with Plugins and Themes</h2>
+
+        <p>This page will let you download and install new Plugins from the Plugins Marketplace.
+            The <a href='?module=Proxy&action=redirect&url=http://plugins.piwik.org/' target='_blank'>Marketplace</a> is where
+                developers publish their plugins and themes to make them available to all Piwik users.</p>
+
+        <i>Note: all plugins are available for free at present; in the future we will enable Paid Plugins in the Marketplace
+            (<a href='mailto:hello@piwik.org?subject=Marketplace - Sell Plugin'>contact us</a> for early access).
+        </i>
+    </div>
+{% endblock %}

plugins/Installation/Installation.php

@@ -20,7 +20,7 @@ use Piwik\Translate;
  */
 class Installation extends \Piwik\Plugin
 {
-    protected $installationControllerName = 'Controller';
+    protected $installationControllerName = '\\Piwik\\Plugins\\Installation\\Controller';
 
     /**
      * @see Piwik_Plugin::getListHooksRegistered

plugins/PleineLune/README.md

@@ -4,7 +4,7 @@ Create a Theme for Piwik
 Quick start
 ------------
 
-1. Create a file to describe your plugin with the following path: "plugins/<yourPluginName>/plugin.piwik.json"
+1. Create a file describing your plugin at the following path: "plugins/YourPluginName/plugin.piwik.json"
 
 ```json
 {
@@ -13,7 +13,7 @@ Quick start
 }
 ```
 
-2. Create your stylesheet file with the following path: "plugins/<yourPluginName>/stylesheets/theme.less"
+2. Create your stylesheet file with the following path: "plugins/YourPluginName/stylesheets/theme.less"
 
 3. Activate your theme on the Piwik instance: Settings > Platform > Themes