Merge branch 'hotfix/diffs'
Replace google analytics code with piwik in templates
Merge branch 'hotfix/addpiwik' into develop