...
Merge branch 'master' of https://github.com/martinsstikuts/mb-log-monitor

Conflicts:
	monitor.py