Fixing screenshot tests, expected screenshots had errors
Merge branch 'master' of /home/matt/dev/piwik-master/tests/PHPUnit/UI with conflicts.