Make fw optional
Merge branch 'fixFirewall' of github.com:RobQuistNL/puppet-kolab

Conflicts:
	manifests/init.pp