added locking. Also added configure_monitors to server to forward request.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/client/Notifier.py