respond to request method of options
Merge branch 'master' into mvc

Conflicts:
	usdlc2/Client_Support.html