purge
Merge branch 'master' of https://github.com/stefanmonkey/stefanbo

Conflicts:
	development/py_project/soft_install/install_zabbix.sh