Added HTCPCP data
Added more HTTP data
auto-merge nightly into master
Added RFC 2774, UPnP, and RFC 3229 data
Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	data/http-methods.json
	data/http-status-codes.json
	data/mime-types.json
	data/url-schemes.json
regen
auto-merge staging into master
auto