Mise à jour Cha
Merge branch 'master' of https://github.com/protoLabs/FluxRss

Conflicts:
	Vue/vueClass.php
Merge branch 'master' of https://github.com/protoLabs/FluxRss