added support for rollover code descriptions in html export
merged html-code-descriptions branch down
Merge branch 'develop' of https://github.com/projectcypress/health-data-standards into develop
fixed tests after html code mouse over fix
First pass at implementing the tobacco use template
Forgot to prefix the smoking status template partial with an underscore
updated qrda templates to fix diagnosis active and medication administered, added partial for medication details
Merge remote-tracking branch 'ah/develop' into develop
updated measure period pushed onto parsed hqmf
Merge branch 'develop' of https://github.com/projectcypress/health-data-standards into develop
added payer information to cat1 export, fixed patient expired importer
fixed MP end date
Now outputing the discharge disposition code if it is present
Merge remote-tracking branch 'cy/develop' into develop
Fixing the id of the entries by using the MITRE OID as the root and the BSON::ObjectId as the extension
Merge remote-tracking branch 'ah/develop' into develop
Merge branch 'develop' of http://github.com/projectcypress/health-data-standards into develop
Merge remote-tracking branch 'mike/develop' into develop

Conflicts:
	lib/health-data-standards/import/cat1/patient_importer.rb
Merge branch 'develop' of http://github.com/projectcypress/health-data-standards into develop
added payer information with name to both test fixtures, added check for payer in html export test