fixes bug 940560 - add optional analytics back into the webapp
Merge pull request #1700 from peterbe/bug-940560-add-optional-analytics-back-into-the-webapp

fixes bug 940560 - add optional analytics back into the webapp