not sure
Merge branch 'master' of https://github.com/adamsynnott/yii-analytics-piwik

Conflicts:
	components/ClientScript.php