PIWIK-767 changed segmentEditor so it has configurable access level
PIWIK-767 changed segmentEditor so it has configurable access level
Merge branch 'master' of https://github.com/piwik/piwik into feature/SegmentEditor
PIWIK-767 cleanup after review
PIWIK-767 changes in global.ini after review
PIWIK-767 cleanup after review
PIWIK-767 cleanup after review
Typo found by phpstorm
Fixes #5051 Custom Logo rules now are:
 * On Login page, custom logo displayed with {{{ width: 240px }}}
 * On dashboard and admin pages, custom logo displayed with  {{{ max-height: 50px; }}}

Please report if you still have some issue (you can delete tmp/assets/* files to re-generate css)
Delete htaccess, as it is created automatically on upgrade
Fix installer regression
Merge remote-tracking branch 'origin/master'
Fixes #5204  Add new system check whether the Piwik server supports managing processes in CLI
added new less variables for easier theming of submenu and widget title
Merge branch 'master' of github.com:piwik/piwik
Merge pull request #275 from d-skora/feature/SegmentEditor

Feature/segment editor Fixes #5172
remove en.json if present to prevent changes for english translation file
small fix
language update  refs #3430
Merge pull request #284 from piwik/translationupdates

[automatic translation update] Updated 456 strings in 6 languages (bg, fr, ja, nn, pl, ro)