Remove French
Merge branch 'work_srozen'

Conflicts:
	server.c
Merge branch 'master' into work_srozen