rfg
Merge remote-tracking branch 'origin/master'

Conflicts:
	epic_editor/Makefile
	epic_editor/options.c
ej