Defines in global
Merge branch 'work_srozen'

Conflicts:
	server.c