Required and Optional setting API integrated
Merge pull request #1560 from ssushma/dev-branch

Required and Optional setting API integrated
edit unit asignment view has been updated.
Merge pull request #1561 from shivalinga/dev-branch

edit unit asignment view has been updated.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch