Update Dams Function models, views, tests, and controller to use nested-attributes feature. Add Function controller test. DHH-113
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/models/dams_function_internal.rb
Merge remote-tracking branch 'upstream/develop' into develop
Refactored partial edit view for Note types to be more generic. DHH-221