Command line, accept with caution
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controllers/Server/ServerFileDaemon.py