testing branch commit.
Removing change to test branch.
Added test comment for git push test.
Merge branch 'master' of github.com:alulaq2/ion-ux
Updated for Resource Type labels
Merge branch 'master' of github.com:alulaq2/ion-ux
Merge branch 'master' of https://github.com/ooici/ion-ux
Merge branch 'master' of https://github.com/ooici/ion-ux
Added new layout templates.
Merge branch 'master' of github.com:alulaq2/ion-ux
Merge branch 'master' of https://github.com/ooici/ion-ux
Merge branch 'master' of https://github.com/ooici/ion-ux
Merge branch 'master' of https://github.com/ooici/ion-ux
v3.0.3 R3 UI D1 Delivery. See R3 UI in confluence for details.
testing branch commit.
Removing change to test branch.
Added test comment for git push test.
OOIION-1784
The UI now only makes one call to get the list of resources for a facility instead of 3.  There should be no difference to the user.
OOIION-1778 (M156 : schema versioning)

Added persisted_version to the edit page black_list, keeping it from appearing on a resources's Edit page.  Even if the FileMaker changes (the ones that include the new schema versioning attrs) haven't been propigated, this won't break anything.

Stashed all FMP CSV files in new ui_specs dir.  r3candidate, specifically.
Bump to 3.0.0-dev