Merge branch 'master' into nmedw

* master: (22 commits)
  move reason xpath override and admit_time to Cat1::EncounterPerformedImporter
  fixing bug in encounter order template that didn't scop p[erfereed codes sets.  Fixing issue in oid lookup for field values
  modifying templates to support multiple result values
  adding the filename of templates to the ERubius object so we can get exception messages with the location in the template that caused them in the backtrace
  adding ability lookup provider information by name if npi does not exist.  Adding ability for applications to overide the Provider.resolve_provider method as a means to deal with providers without an npi number
  Updating changelog in readme.
  fixing test to reflect that procedure order should use time, not start_time.
  import entry.time (not entry.start_time) for procedure orders
  Updating changelog in the readme.
  fixing test to reflect that diagnostic study order should use time, not start_time.
  import entry.time (not entry.start_time) for diagnostic study orders
  Updating the changelog in the readme.
  add admit_time to encounter importer
  Updating to the changelog in the readme.
  Revert "add incision_time to procedure imports". Use cat1 procedure performed importer instead.
  use cat1 procedure performed importer
  add incision_time to procedure imports
  Updating the README changelog
  adding 38 week gestational period
  Minor tweak in the lockfile to accomidate the java platform
  ...

Conflicts:
	lib/health-data-standards/export/helper/cat1_view_helper.rb
	lib/health-data-standards/import/cat1/encounter_performed_importer.rb
	lib/health-data-standards/models/cqm/query_cache.rb
	templates/cat3/_continuous_variable_value.cat3.erb
	templates/cat3/_measure_data.cat3.erb
	templates/cat3/show.cat3.erb
	test/unit/models/cqm/query_cache_test.rb