nicer optiional cors feature: nicer, but still not nice

Conflicts:
	bin/rock-webapp