masterfile
fixed

Merge branch 'master' of https://github.com/schenkl/Coldipozzo

Conflicts:
	masterfile.starlight
Merge branch 'master' of https://github.com/schenkl/Coldipozzo
Merge branch 'master' of https://github.com/schenkl/Coldipozzo
Pulled update_monit_config.rg
Merge branch 'master' of https://github.com/schenkl/Coldipozzo
Merge branch 'master' of https://github.com/schenkl/Coldipozzo
rainwise

Merge branch 'master' of https://github.com/schenkl/Coldipozzo