Fixed conflict from last merge for damsProvenanceCollection model class.
Refactor the controller and forms for ProvenanceCollection using nested_attributes.(DHH-86)
Merge branch 'develop' of https://github.com/ucsdlib/damspas into develop