Enhance extended resource framework to pass multiple arguments to method fields
Merge pull request #229 from shenrie/master

Enhance extended resource framework to pass multiple arguments to method fields
Set description field in Negotiation object
Merge pull request #230 from shenrie/master

Fix for OOIION-684 - Set description field in Negotiation object
Merge branch 'master' of github.com:ooici/pyon into exception_event

Conflicts:
	extern/ion-definitions