HTML-494 - Support for displaying one of a group of followup sections, depending on the answer to a coded obs
fixing merge conflicts
Merge pull request #56 from djazayeri/HTML-494

HTML-494 - Support for displaying one of a group of followup sections, depending on the answer to a coded obs