Merge branch 'CSPACE-4446'

* CSPACE-4446:
  NOJIRA: refactored Sidebar.js formatMedia
  NOJIRA: refactored logic for finding media snapshot url and modifying it per derivative and pointed tests at actual images
  NOJIRA: still fixing whitespace issues
  NOJIRA: still fixing whitespace issues
  NOJIRA: hopefully fixed whitespace issues
  NOJIRA: fixed sidebar getImageSource
  NOJIRA: Fixign up a test.
  removed dummy <img> tag that had been added for testing purposes
  media snapshot component
#CSPACE-4446: Slight cleanup of Amy's CSPACE-4446 branch.
NOJIRA: Further integration with the app layer for locked movement. Workflow field is now assumed to be in the fields block.
NOJIRA: Further integration with app layer's hard save workflow
NOJIRA: media snapshot component now dynamically updates if a related media record is added. added additional images for testing purposes to src/test/data/images
CSPACE-5008: Adding proper place-search uischema and uispec to test data; clean up PlaceTemplate.html to fix alignment of bottom button-row: not yet working
Merge branch 'CSPACE-4446'

* CSPACE-4446:
  NOJIRA: media snapshot component now dynamically updates if a related media record is added. added additional images for testing purposes to src/test/data/images
Merge branch 'master' of git://github.com/collectionspace/ui
CSPACE-5008: Making id value for secondary-nav-footer-menu-sub unique in order to fix alignment issue.
Merge remote-tracking branch 'upstream/master' into Place-authority
CSPACE-5008: Adding css selector for secondary-nav-footer-menu-sub id added in previous commit
Revert "NOJIRA: Updating version to 2.2"

This reverts commit 4e3d0e7dce3ce683bade462c59212fdf7677050f.
CSPACE-5008: Fixing an oocss-related selector so it doesn't have unwanted effects, eg., applying a background to Narrower Context
Revert "Revert "NOJIRA: Updating version to 2.2""

This reverts commit 9de6caf2bcd5f49e71136c43c8ebf0f42073e691.
Merge branch 'Place-authority'

* Place-authority: (32 commits)
  CSPACE-5008: Fixing an oocss-related selector so it doesn't have unwanted effects, eg., applying a background to Narrower Context
  CSPACE-5008: Adding css selector for secondary-nav-footer-menu-sub id added in previous commit
  CSPACE-5008: Making id value for secondary-nav-footer-menu-sub unique in order to fix alignment issue.
  CSPACE-5008: Adding proper place-search uischema and uispec to test data; clean up PlaceTemplate.html to fix alignment of bottom button-row: not yet working
  CSPACE-5008: Button now works; resolve Demands.js conflicts, update CreateNewTest.js to account for new concept authority
  CSPACE-5008: Update test data uischema and uispec; add ' create new from...' button at bottom
  CSPACE-5008: Additions to test files - login/status.json, recordlist.json and recordtypes.json
  CSPACE-5008: Final fixes per Yura: update Demands.js, add css changes to LifeSci
  CODE7 - Minor cleanup in addition to revisions requested by Yura
  added oocss selector
  CODE-6: Change 'name' field in placeNameGroup to 'placeName' to avoid advanced search issues. Make related changes to labels, advanced search and test data
  CODE-6: Experiment to find proper <services-tag> nomenclature
  CODE-6: Another experiment: rename field in App layer and UI, use <services-tag> to point to field name in services schema
  CODE-6: Revert to what failed earlier, in order to compare UISchema and UISpec
  CODE-6: Reinsert configuration change that led to successful test earlier
  CODE-6 The previous test worked. Now I'm switching back to confirm earlier failure
  CODE-6 Temporarily add a different nested simple-text field to advanced search for comparison purposes
  CODE-6: removing selector added while troubleshooting.
  Code-6: Reverting previous experiment
  CODE-6: Effort to fix error message received when searching on Name field in advance search for Place
  ...
nojira: reverting to most current collectionspace/ui commit
#CSPACE-4881: Updated vocab schema in preparation for the main refactoring related to default non default vocabs.
NOJIRA: Added a comment to cspace.vocab
CSPACE-5092: Fixing an issue with navigating to records from listview without offset.
CSPACE-5072: Removed bottom normal location