bugfix

Conflicts:

	src/webui/extjs.c