(m) variable renamed (uppercase since it's a constant)
Merge branch 'master' of github.com:corso-python-prato/share-system-team2

Conflicts:
	client/test_client_daemon.py
test_client_daemon default verbosity restored