Include CORS headers in responses when CORS is requested
Handle CORS preflight OPTIONS requests
Merge remote-tracking branch 'tomhughes/master' into content-types

Conflicts:
	src/main.cpp