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

core/Menu/MenuAdmin.php

core/Menu/MenuUser.php

core/Plugin/ControllerAdmin.php

core/Settings/Manager.php

plugins/API/templates/listAllAPI.twig

plugins/CoreAdminHome/Controller.php

plugins/CoreAdminHome/Menu.php

plugins/CoreAdminHome/lang/en.json

plugins/CoreAdminHome/stylesheets/generalSettings.less

plugins/CoreAdminHome/stylesheets/menu.less

plugins/CoreAdminHome/templates/_menu.twig

plugins/CoreAdminHome/templates/generalSettings.twig

plugins/CoreAdminHome/templates/pluginSettings.twig

plugins/CoreAdminHome/templates/trackingCodeGenerator.twig

plugins/CoreHome/CoreHome.php

plugins/CoreHome/Menu.php

...reHome/angularjs/notification/notification.directive.less

...reHome/angularjs/siteselector/siteselector.directive.less

plugins/CoreHome/templates/_topBarTopMenu.twig

plugins/CoreHome/templates/_userMenu.twig