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

core/Tracker.php

plugins/CoreHome/templates/footer.tpl

plugins/UserCountryMap/js/realtime-map.js

plugins/UserCountryMap/js/vendor/chroma.min.js

plugins/UserCountryMap/js/vendor/jquery.qtip.min.js

plugins/UserCountryMap/js/vendor/kartograph.min.js

tests/PHPUnit/Integration/ImportLogsTest.php

...ion/expected/test_ImportLogs__MultiSites.getAll_month.xml

...ed/test_ImportLogs__UserSettings.getBrowserType_month.xml

...test_ImportLogs__UserSettings.getBrowserVersion_month.xml

...pected/test_ImportLogs__UserSettings.getBrowser_month.xml

.../test_ImportLogs__UserSettings.getConfiguration_month.xml

...ected/test_ImportLogs__UserSettings.getOSFamily_month.xml

...on/expected/test_ImportLogs__UserSettings.getOS_month.xml

...xpected/test_ImportLogs__UserSettings.getPlugin_month.xml

...ogs__VisitTime.getVisitInformationPerServerTime_month.xml

...eIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml

...Transitions__Transitions.getTransitionsForPageUrl_day.xml

tests/resources/fake_logs_replay.log