Updates after connectathon 7

git-svn-id: http://gforge.hl7.org/svn/fhir/dstu1/build@2884 2f0db536-2c49-4257-a3fa-e771ed206c19