Update internal data model to include dictionaryId within dataDictionary object

[hmaier-fws]

Issue

mdEditor Version (find version under settings):

mdEditor Web Address (enter the URL): v1.2.1, https://github.com/adiwg/mdEditor/tree/405d949e

Issue Description:

The current internal data model (mdEditor-JSON) does not include the dictionaryId as an element of the dataDictionary object. The dictionary identifier should be an element of the dataDictionary object (dataDictionary.dictionaryId), similar to how the contact object is structured.

See related issues regarding import and export of mdJSON: #679, #704

Steps to reproduce:

1. Load a mdEditor record containing a data dictionary
2. View the data dictionary JSON using: "Dashboard" - "View Dictionaries" - "Preview JSON" (or export dictionary using "Export Selected")

Observed Results:

The dictionary is structured as follows, with the dicionaryId being an element distinct from the dataDictionary object:

{
    dataDictionary": {
        ...various dictionary elements
    },
    dictionaryId": "df5d4658-dd32-45bd-969a-3313aaf4b848"
}

Desired Results:

The dataDictionary object should contain the dictionaryId element and be structured as follows in the internal mdEditor-JSON, exported mdEditor-JSON, and exported mdJSON:

{
    dataDictionary": {
        dictionaryId": "df5d4658-dd32-45bd-969a-3313aaf4b848",
        ...remaining dictionary elements
    }
}

[eyeyellow]

In resolving the merge conflicts for #700, I noticed that the identifiers were added to route models for records and contacts:

Records:

mdEditor/app/pods/record/new/id/route.js

Line 14 in 36b3885

record.set('recordId', record.get('uuid'));

Contacts:

mdEditor/app/pods/contact/new/id/route.js

Line 17 in 36b3885

record.set('contactId', record.get('uuid'));

But they weren't added for dictionaries. Not sure if it's related, but just something that I noticed that got added as part of #690

[dvonanderson]

@eyeyellow I think originally we created the UUID for dataDictionary outside of json object for dataDictionary. I am guessing the schema was originally presented that way, but I do have a fix coming in a few minutes that will fix that.