Latest updates
Merge branch 'master' of https://github.com/PierrickI3/inin-cic-install

Conflicts:
	Puppetfile