Added missing #endif

Whoops.
Merge pull request #91 from Lord-Kamina/master

Added missing #endif
things like these overcome the best :-)
removed a config entry, and added one.
Implemented feature request for adding asian style text highlighting.
Merge branch 'master' into webserver

Conflicts:
	game/layout_singer.cc
fixed merge conflicts