Global update
Merge branch 'master' of github.com:Alexiscap/slyset

Conflicts:
	assets/piwik/tmp/cache/tracker/1.php
	assets/piwik/tmp/cache/tracker/general.php