Merge branch 'sakaimaster' into dev
SAKIII-6008 - Users added or removed to world are not reflected in Manage Participants overlay of that world
https://jira.sakaiproject.org/browse/SAKIII-6008
SAKIII-6001 - When you upload content to a collection it refreshes but the content isn't shown
https://jira.sakaiproject.org/browse/SAKIII-6001
Merge pull request #2342 from christianv/SAKIII-6008

SAKIII-6008 - Users added or removed to world are not reflected in Manage Participants overlay of that world
SAKIII-6009 - Attempted removal of last manager from world has error in gritter message

Squashed commit of the following:

commit 08aa49a7cef3343e994757e96828152faf80f32c
Author: Bert Pareyn <pareyn.bert@gmail.com>
Date:   Wed Jul 18 12:09:18 2012 +0100

    SAKIII-6009 Check if group is being edited before accessing the global group variable

commit 4c927f8edc481d8ef34c874a9a443494f7820a51
Merge: 74704f9 e399ce9
Author: Bert Pareyn <pareyn.bert@gmail.com>
Date:   Wed Jul 18 12:06:01 2012 +0100

    Merge remote-tracking branch 'christian/SAKIII-6009' into SAKIII-6009

commit e399ce94a799590d0e5b198f286f66c4fb73f151
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Tue Jul 17 22:20:22 2012 -0700

    SAKIII-6009 - Attempted removal of last manager from world has error in gritter message
    https://jira.sakaiproject.org/browse/SAKIII-6009
Merge pull request #2343 from bp323/SAKIII-6009

SAKIII-6009 - Attempted removal of last manager from world has error in gritter message
SAKIII-6013 My Library Count Issues in CollectionViewer

Squashed commit of the following:

commit c2a5a64e1ba6aa4a8fce674ac0f16b25bc76e2ed
Merge: fac0102 9843f07
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Jul 18 14:10:32 2012 -0700

    Merge remote-tracking branch 'bp323/SAKIII-6013' into bp323-SAKIII-6013

commit 9843f07777413a648beb3b0220783845090eb0e8
Author: Bert Pareyn <pareyn.bert@gmail.com>
Date:   Wed Jul 18 12:41:01 2012 +0100

    SAKIII-6013 My Library Count Issues in CollectionViewer

commit 43b5c681ebdfc7f41de8b6dbf436eb7d529b6c99
Merge: 74704f9 dca10e5
Author: Bert Pareyn <pareyn.bert@gmail.com>
Date:   Wed Jul 18 12:12:24 2012 +0100

    Merge remote-tracking branch 'dean/SAKIII-6013' into SAKIII-6013

commit dca10e5b4a844b201c6524f14bc35996d00364a0
Author: Dean Angerer <DeanAngerer@Gmail.com>
Date:   Tue Jul 17 17:59:15 2012 -0400

    SAKIII-6013 Update me feed before opening Collection Viewer.
    https://jira.sakaiproject.org/browse/SAKIII-6013
Merge pull request #2344 from bp323/SAKIII-6013

SAKIII-6013 My Library Count Issues in CollectionViewer
Merge branch 'sakaimaster' into dev
MYB-1712: Use new form validation wrapper API for QuickLinks form
SAKIII-6015 Hide the "delete" button for worlds until we can make world deletes work properly
SAKIII-6019 Multiple previews of a template can prevent use of Add People on world create page
https://jira.sakaiproject.org/browse/SAKIII-6019
SAKIII-6021 - Cannot click links after adding pooled content to library
https://jira.sakaiproject.org/browse/SAKIII-6021
SAKIII-6020 - Sakai2Tools added as area of world
https://jira.sakaiproject.org/browse/SAKIII-6020
SAKIII-6023 - Discussion topics are subject to indexing delay
https://jira.sakaiproject.org/browse/SAKIII-6023
Merge pull request #2351 from bp323/SAKIII-6019

SAKIII-6019 Multiple previews of a template can prevent use of Add People on world create page

* bp323/SAKIII-6019:
  SAKIII-6019 Multiple previews of a template can prevent use of Add People on world create page https://jira.sakaiproject.org/browse/SAKIII-6019
Merge pull request #2355 from christianv/SAKIII-6023

SAKIII-6023 - Discussion topics are subject to indexing delay
Merge branch 'SAKIII-6021' of git://github.com/christianv/3akai-ux into SAKIII-6021

* 'SAKIII-6021' of git://github.com/christianv/3akai-ux:
  SAKIII-6021 - Cannot click links after adding pooled content to library
Merge branch 'master' into 1.4.0

* master:
  SAKIII-6021 - Cannot click links after adding pooled content to library
Merge branch 'SAKIII-6020' of git://github.com/christianv/3akai-ux into SAKIII-6020

* 'SAKIII-6020' of git://github.com/christianv/3akai-ux:
  SAKIII-6020 - Sakai2Tools added as area of world