Improved the test-code validation
Resolved conflicts

Merge branch 'master' of https://github.com/gforge/comorbidities.icd10

Conflicts:
	R/cmrbdt.calc.R
Fixed issue with weight.Charlsons.Quan2011 and added test so that it matches the max according to the article
Merge branch 'master' of https://github.com/gforge/comorbidities.icd10

Conflicts:
	R/weights.R