Testing commit to my repo.
Removed test text.
SAKIII-4886 - remove jwplayer function in carousel
https://jira.sakaiproject.org/browse/SAKIII-4886
Merge remote branch 'central/master' into dev
Merge pull request #1717 from christianv/SAKIII-4886

SAKIII-4886 - remove jwplayer function in carousel

* christianv/SAKIII-4886:
  SAKIII-4886 - remove jwplayer function in carousel https://jira.sakaiproject.org/browse/SAKIII-4886
Merge branch '1.2.0'
Merge remote branch 'central/master' into dev
Merge branch 'dev' of github.com:ets-berkeley-edu/3akai-ux into dev

* 'dev' of github.com:ets-berkeley-edu/3akai-ux: (427 commits)
  MYB-1523: Add the new walktime widget to devwidgets and add for new users
  SAKIII-5312 rows/columns rendered in wrong places on a sakai doc
  SAKIII-5321 Scripts embedded in Content Authoring docs are executed if they are entered via Edit HTML
  SAKIII-5324 Changed timestamp of SakaiDocs never updates
  MYB-1512: Indentation tweak in config_custom.
  MYB-1512: Restore removed top "Me"  menu code in config_custom.js
  MYB-1512: Remove unneeded menu code in config_custom.js
  MYB-1511: Two links in Quicklinks links are outdated and need new URLs
  MYB-1505: MyLinks widget not appearing in dashboard for new users.
  Was a mismatch, due to cut & paste changes?, between the id of the agree_to_share_data in seflregister.html and selfregister.js. Changed to be chk_agree_to_share_data in the html as the user visible language refers to that rather than the old agree to messages from advisors
  MYB-1514 - Was a mismatch, due to cut & paste changes?, between the id of the agree_to_share_data in register.html and register.js. Changed to be chk_agree_to_share_data in the html as the user visible language refers to that rather than the old agree to messages from advisors
  MYB-1508: JSON template fix for DynLists and notifications.
  SAKIII-5322 Improve related-content queries from recentchangedcontent
  SAKIII-5321 saneHTML the content before it is inserted in the DOM
  SAKIII-5308 Add the 'data-sakai-addcontextoption' attribute to the privspace li's so that the counts can be updated correctly
  SAKIII-5210 add resourceType and change messagebox in comments to prevent the messages from going in the sent box
  SAKIII-5293 Replace the old path in the tmp widget data with the new path upon save
  SAKIII-5291 - MoreWidgets display as vertical list instead of in carousel https://jira.sakaiproject.org/browse/SAKIII-5291
  SAKIII-5282 Ordered lists are displayed as unordered lists after save
  SAKIII-5270 Add the collection managers group to the current user's subjects so they see the management interface when navigating there
  ...
Merge remote-tracking branch 'ets/dev' into dev

* ets/dev: (53 commits)
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release org.sakaiproject.nakamura.uxloader-wrap-1.2.0-RC1
  [maven-release-plugin] rollback the release of org.sakaiproject.nakamura.uxloader-wrap-1.2.0-RC1
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release org.sakaiproject.nakamura.uxloader-wrap-1.2.0-RC1
  SAKIII-5499 comment out hashfiles module, update version to 1.2.0-RC1
  release_pre_process: Moving config files from 1.2-SNAPSHOT to 1.2.0-RC1
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release org.sakaiproject.nakamura.hashfiles-1.2.0-RC1
  SakIII-5503 Change <parent> of org.sakaiproject.nakamura.hashfiles to sonatype-parent and release independently of 3akai-ux in order to resolve dependency ordering issues.
  SAKIII-5500 fix release_pre_process_files.sh current and next version handling
  MYB-1565: Missing requirement for suppressing DLs and Notifications from non-advisors
  NOJIRA: Once again lost formatting on 403 pages.
  MYB-1565: Non-advisers see Notifications and Dynamic Lists left-hand menu items
  MYB-1573: Store CalCentral's topnav background image reference in our own skin.
  SAKIII-5487 Restoring versions wipes away widget user content (e.g., discussion messages and comments)
  MYB-1571: Add Widget Overlay Broken by Removal of MyLinks and MyTasks as defaults for new users
  SAKIII-5488 - Sanitize JavaScript in page in collection https://jira.sakaiproject.org/browse/SAKIII-5488
  SAKIII-5486 - don't delete messages while page edit https://jira.sakaiproject.org/browse/SAKIII-5486
  SAKIII-5471 - Fix drag/drop elements in contentauthoring https://jira.sakaiproject.org/browse/SAKIII-5471
  ...
Merge branch 'dev' of github.com:ets-berkeley-edu/3akai-ux into dev

* 'dev' of github.com:ets-berkeley-edu/3akai-ux:
  MYB-1598: Add to UI not rendering on calcentral-qa
  NOJIRA: Code cleanup for walktime widget
Merge remote-tracking branch 'ets/dev' into dev

* ets/dev:
  NOJIRA Return CalCentral 3akai-ux to 1.2-SNAPSHOT
  NOJIRA Undo pom.xml wackiness left from central project merges (reverse-merged from commit 250e4d14570e9c4298514f2da17a6b86e642434d)
  [maven-release-plugin] prepare release 1.2.0
  release_pre_process: Moving config files from 1.2-SNAPSHOT to 1.2.0
Merge remote-tracking branch 'ets/dev' into dev

* ets/dev:
  MYB-1611: Create new world - seeing OAE options, not CalCentral
  MYB-1590: Left nav elements with more than 4 lines get wrong bg color at bottom
Merge branch 'dev' of github.com:ets-berkeley-edu/3akai-ux into shackerdev

Conflicts:
	README.md
Removing readme from templates/worlds since it was being picked up as if a world template.
Merge branch 'dev' of github.com:ets-berkeley-edu/3akai-ux into dev

* 'dev' of github.com:ets-berkeley-edu/3akai-ux:
  Removing readme from templates/worlds since it was being picked up as if a world template.
  KERN-2805 Remove unnecessary wildcards
MYB-1629: Remove deprecated showinsakaigoodies config option from all CalCentral widgets that still use it.
[MYB-1583] Refactored quicklinks widget with details from ticket
[MYB-1583] Namespacing fixes, and others from Christian's code review
SAKIII-5715 Do not send empty "q" parameter to /var/search/pool/all.json
[MYB-1583] Final work for quicklinks with role-aware fixes