updated: analytics view to support new version of the Analytics plugin
for Google Analytics and Piwik
Revert "wrapped version 2.1"

This reverts commit 984f9d689b1de7290ca17045d6bb1ce11326074a.