fixed some debian defines
remove useless line
Merge branch 'devs'

Conflicts:
	src/Server/server.cpp