refactored piwik analtics plugin
Merge branch 'hotfix/fix-piwik-analytics'