Options done
Merge remote-tracking branch 'origin/master'

Conflicts:
	coapthon2/layer/resource.py
	coapthon2/messages/request.py