Merge branch 'master' of github.com:piwik/piwik
updated submodule
refs #5019 using the cache reduced the time spent in tracking (piwik.php) from 2seconds to 200ms (on my local env)
refs #5019 should fix tests
refs #5019 added missing parse
fixes #5227 make sure to set the left position of the dashboard settings control after showing it
fixes #5203 keep transparency when uploading logo, also improves quality of generated logo
fixes #5207 keep transparency when uploading logo, also improves quality of generated logo
Refs #5189 Events in Visitor Log: Display `[Value]` instead of ` - Value`
Make sure there is a line break between Custom Variables in the tooltip
refs #5180 this could be related to a specific PHP version or suhosin? At least display a message to use --piwik-domain instead of --url in such a case
Refs #5189 Events in Visitor Log: Display the URL only if it is different URL from the previous action in the log.
+ Display events not double encoded
Merge remote-tracking branch 'origin/master'
refs #5192 no longer needed to pass the menu instance in the event, only added it for easier refactoring
Merge remote-tracking branch 'origin/master' into 5192_menu
2.3.0 KABOOM
refs #5192 added some doc blocks and prevent the menu hooks from appearing in the documentation as they are deprecated
Merge pull request #291 from piwik/5192_menu

refs #5192 Simplify / improve top menu
Merge remote-tracking branch 'origin/master' into morpheus_defaulttheme

Conflicts:
	plugins/CoreHome/angularjs/siteselector/siteselector.less
Merge branch 'morpheus_defaulttheme' of github.com:piwik/piwik into morpheus_defaulttheme