Merge branch 'devel' of https://github.com/sylmarien/puppet-softwareAutoInstall into devel

Conflicts:
	manifests/init.pp
Merge branch 'devel' of https://github.com/sylmarien/puppet-softwareAutoInstall into devel