From forum feedback: http://forum.piwik.org/read.php?2,112741

- change idsite to idSite in Overlay URLs in piwik.js
- don't init top controls if top controls container can't be found
- add default parameter for $urls in SitesManager.setSiteAliasUrls so site alias URLs can be reset
- fix bugs in UI tests database setup (including moving dashboard setup to UITestFixture class & keeping outside of
  setUp function so --persist-fixture-data will work in case the super user is deleted)
- Add queryParamOverride testingEnvironment variable.
- fix screenshot testing page renderer's method of waiting for CSS images
- add margin bottom & left for widgetized controls for tests
- add diagnostics to upload_artifacts.sh script

refs #4225 sort object to make sure we get the same test results on PhantomJS, Webkit and any other browser

(cherry picked from commit 1dc0e116)

And factored out code in ServerFilesGenerator.php

Small static file server proxy, with compression, caching.
 Used to server piwik.js and the merged+minified CSS and JS files

we shouldnt disable cookies when deleting cookies, these are two different things.

cheers Peter for finding this bad bug!

The new deleteCookies function can be used, whenever new_visit=1 is used, to ensure the cookies are re-created for the new visitor.

For example use as:
_paq.push(["deleteCookies"]);
_paq.push(["appendToTrackingUrl", "new_visit=1"]);

put both at the same time. Make sure you remove the "deleteCookies" otherwise. This should fix it!

I have updated the faq at http://piwik.org/faq/how-to/#faq_187

Updated doc at: http://piwik.org/docs/tracking-api/reference/
 and http://piwik.org/docs/page-speed/

 * by default, send performance.timing.responseEnd - performance.timing.requestStart as generation time with the tracking request
 * if the performance.timing API is not supported by the browser, don't send the metric
 * new method disablePerformanceTracking()
 * new method setGenerationTimeMs(generationTime) to set the generation after measuring it on the server side 

update JSON implementation from 2012-10-08 version of json2.js; applied D.C.'s changes thru-out, including the defense against window.prototype (which I think refers to var declarations shadowing window.prototype)

 * when the referrer is matched to determine whether the session should be started, don't match the domain. this caused trouble for some users and doesn't provide real advantages.
 * new method tracker.setApiUrl() that can be used if the tracker url and the api url (which is used in overlay) differ

Updating the LICENSE.txt and license notice to link to piwik.org page at: http://piwik.org/free-software/bsd/
Anthon I moved your name to the page on the site.

the page on opensource.org was not ideal and explaining well the situation.