Fix json parsing bug (Atom.category) in java reference implementation + pascal updates

git-svn-id: http://gforge.hl7.org/svn/fhir/dstu1/build@2604 2f0db536-2c49-4257-a3fa-e771ed206c19
[C#] Changed FhirUri to use string instead of Uri internally

git-svn-id: http://gforge.hl7.org/svn/fhir/dstu1/build@2606 2f0db536-2c49-4257-a3fa-e771ed206c19
Merge pull request #2 from hl7-fhir/master

keep update