Swapped order of elements to pass Cypress schema reqs.
Ref #54 - Removal of extra 'id' element
Merge pull request #56 from yoon/52-manfacturerModelName

Ref #52 - Swapped order of elements to pass Cypress schema reqs.
Merge pull request #55 from yoon/54-extra-id-element

Ref #54 - Removal of extra 'id' element
Merge pull request #60 from yoon/typecode

#59 changing entryRelationship attribute type to typeCode
Now using a default bundle for scoop and filter

Scoop and filter code had been made dependent on a bundle_id
attribute being present on a patient. This makes sense for Cypress
but not so much for applications like popHealth. For now, if there
is no bundle_id present on the patient, the code will select the
latest bundle available for its code sets. In the future, we should
probably decouple this further.
adding timestamps to models, adding filter parameter to Cat 3 generation
Revert "Merge branch 'population_count' into nmedw"

This reverts commit 09f8cd3c5450140e32e616c1f9385c7ab0801679, reversing
changes made to 15988b089b7bba3e364f9ec18dfac157ba05e9f1.
Merge branch 'develop' into nmedw

* develop:
  adding timestamps to models, adding filter parameter to Cat 3 generation
  Now using a default bundle for scoop and filter
  Ref #54 - Removal of extra 'id' element
  Swapped order of elements to pass Cypress schema reqs.

Conflicts:
	templates/cat3/show.cat3.erb