Fix for elist and some mux compatibility for valid()
yet another fix to elist
Merge branch 'ashen-shugar' into ambrosia

Conflicts:
	Server/src/functions.c