[TASK] #feature/SERVICE-REFACTOR Improved google analytics and piwik integration
Merge branch 'feature/SERVICE-REFACTOR' into develop

Conflicts:
	Resources/Private/Templates/PageParts/ServiceGoogleAnalytics.html