Avoid screenshot failure if window.piwik object is not available.
Speed up case where error is shown in screenshot tests.
Fixing piwik.js tests and JSLint after realizing refs #4225
(cherry picked from commit 1dc0e11)
Merge remote-tracking branch 'origin/master'
Removing code coverage refs #4224
fix typo
Adding a comment about how GeoLiteCity is renamed to GeoIPCity.
Output image magick diagnostics.
Documented core/Archive.php.
fixes #4229 added possibility to disable marketplace in config
refs #4229 disable the marketplace while we are in beta
Fixing issue reported in http://forum.piwik.org/read.php?2,106895
Add branch to automated piwik-ui-tests commits.
Do not exit on webpage error.
Removing unused tests/travis/php.ini file.
Merge remote-tracking branch 'origin/master' into viewdata_refactoring