Updated to use new demographics schema from Indivo 2.0 with unmarshalling performed by XmlMarshaller. Replaced used of contact.fullName with demographics.Name.givenName and familyName. Updated indivo_client_flash to request response_format = "application/xml" for demographics.
Added new schemas from Indivo 2.0
Add missing generated Manifest.java file
Merge branch 'master' of github.com:newmediamedicine/CollaboRhythm into indivo2
Moved schemas to match new locations in Indivo 2.0. Renamed VitalSign, CodedValue, and ValueAndUnit to CollaboRhythmVitalSign, CollaboRhythmCodedValue, and CollaboRhythmValueAndUnit. Updated services to use new report names/urls. Eliminated some unused schemas. Changed RecurrenceRule to make frequency a string and interval an int. Improved error reporting in PianoChord
Renamed VitalSign to CollaboRhythmVitalSign in example data. Updated VitalSignHealthRecordService.as to use new field names.
Added setting collaborationEnabled which can be set to false to disable connecting to the collaboration server (Flash Media Server using rtmpBaseURI). Fixed error handing in MessagesHealthRecordService.as so that if an error occurs the connectivity view will no longer remain visible indefinitely.
Specified collaborationEnabled false in default settings for Tablet and Workstation. Changed default indivoServerBaseURL for both to Indivo 2.0 server instance, indivo-demo:9291.
Loaded shared-jking. Started adding support for new SMART Problem/schema.xsd
Merge branch 'indivo2' of github.com:newmediamedicine/CollaboRhythm into indivo2

Conflicts:
	CollaboRhythm.Core.Model/src/assets/healthRecord/schemas/data/common/codes.xsd
	CollaboRhythm.Core.Model/src/assets/healthRecord/schemas/data/core/demographics/demographics.xml
	CollaboRhythm.Core.Model/src/assets/healthRecord/schemas/data/core/demographics/schema.xsd
	CollaboRhythm.Core.Model/src/assets/healthRecord/schemas/data/core/procedure/schema.xsd
	CollaboRhythm.Core.Model/src/assets/healthRecord/schemas/data/core/simplenote/schema.xsd
	CollaboRhythm.Core.Model/src/assets/healthRecord/schemas/metadata/message/message.xsd
	CollaboRhythm.Core.Model/src/collaboRhythm/core/model/healthRecord/service/DemographicsHealthRecordService.as
	CollaboRhythm.Shared.Collaboration/src/collaboRhythm/shared/collaboration/view/CollaborationInvitationPopUp.mxml
	CollaboRhythm.Shared/src/collaboRhythm/shared/model/Account.as
	CollaboRhythm.Shared/src/collaboRhythm/shared/model/demographics/Demographics.as
	CollaboRhythm.Shared/src/collaboRhythm/shared/view/RecordInformationView.mxml
	CollaboRhythm.Shared/src/collaboRhythm/shared/view/SharedRecordItemRenderer.mxml
	CollaboRhythm.Tablet/src/CollaboRhythmTabletApplication.mxml
	CollaboRhythm.Workstation/src/collaboRhythm/workstation/view/ActiveAccountHeaderView.mxml
	CollaboRhythm.Workstation/src/collaboRhythm/workstation/view/HealthRecordWindow.mxml
Meged in additional changes from local indivo2 branch to use Indivo 2.0 with main branch
Merge remote-tracking branch 'origin/master'