* piwik directive to track page and action view
Merge branch 'master' into production