Merge branch 'develop' of https://github.com/MyTF1-Vod/MIS-MAF into maf

Conflicts:
	composer.lock
Merge branch 'maf' of https://github.com/MyTF1-Vod/MIS-MAF into maf
Merge branch 'develop' of https://github.com/MyTF1-Vod/MIS-MAF into maf
Merge branch 'recette29082013' of https://github.com/MyTF1-Vod/MIS-MAF into maf
Merge branch 'recette29082013' of https://github.com/MyTF1-Vod/MIS-MAF into maf
Merge branch 'recette29082013' of https://github.com/MyTF1-Vod/MIS-MAF into maf
Merge branch 'recette29082013' of https://github.com/MyTF1-Vod/MIS-MAF into maf
ADD Fixtures SFR
Merge pull request #33 from MyTF1-Vod/maf

[RFR] Maf
fixing gpp problems
Merge pull request #35 from MyTF1-Vod/FixGreenpepperTests

fixing gpp problems
fix backo
Merge branch 'develop' of https://github.com/MyTF1-Vod/MIS-MAF into retour_recette_30_08_2013