Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/CampagneVaccination.tpl
CORRECTION CONFLIT
Merge branch 'master' of https://github.com/20cent06/Pipe-My-Fork