Fix conflict between DSTU and DEV
Updated docs in ResourceDef to indicate what id is used for (potentially it's also used for other things, though I didn't find any)
Added a test that demonstrates using ResourceDef.id to set the id for a custom resource's profile
Merge branch 'master' of https://github.com/wdebeau1/hapi-fhir