last update CFT ?
piwic merge
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/views/partition/mc_partitions.php
	application/views/playlist/melo_playlist.php
	assets/piwik/tmp/cache/tracker/1.php
	assets/piwik/tmp/cache/tracker/general.php