Small fix to log analytics readme
Merge branch 'master' of github.com:piwik/piwik
Deprecate setForceIp and setForceDateTime, moved to Request object
If cdt is set, use it as current timestamp
Display Ip addresses in debug output
fixes #6110 when 'cdt' tracking Api parameter is set, require token_auth only when the datetime is older than 4 hours.
Add link how to configure Phpstorm with PHPUnit from composer
Fix integration tests
Fix one more test
Removing old parameter
Fixes #6375 refs  #5958 Only set 500 headers when a database failure occurs #hacky
Instead of throwing exceptions, log a message in tracker.
Small tweak to tracker logging
todo was here
Merge pull request #6407 from piwik/6110_cdt

setting 'cdt' tracker parameter in recent past (in the last 4 hours) should not require token_auth   	fixes #6110
Merge branch 'master' into 5940_testRenamingAndCorrectFolders

Conflicts:
	plugins/CoreConsole/Commands/TestsRun.php