SAKIII-5418 - Fix the faceted search
https://jira.sakaiproject.org/browse/SAKIII-5418
SAKIII-5393 - Fix empty page on front-end
https://jira.sakaiproject.org/browse/SAKIII-5393

* remove the server created objects
* only include the current version
* add the forceupdate request in again so the parent
node updates the _lastModified path
Merge pull request #1944 from christianv/SAKIII-5418

SAKIII-5418 - Fix the faceted search
SAKIII-5326 fixed entity dropdown position and contentpermissions selected permission after changing
Merge origin/1.2.0 and fix conflicts
SAKIII-5414 - Fix the more widget container layout
https://jira.sakaiproject.org/browse/SAKIII-5414
Merge remote-tracking branch 'origin/1.2.0'
SAKIII-5431 Disable creation of messages while in edit mode
SAKIII-5430 Discussion Widget: Managers can't add topics when widget set to only managers can add topics

Squashed commit of the following:

commit 96d4064800129f516f23f77618adc01ce53566bd
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Apr 11 17:59:45 2012 +0100

    SAKIII-5430 Add more comprehensive check for management

commit fd1bfdd578245473013b894bef8b30e566b9a66c
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Apr 11 13:21:19 2012 +0100

    SAKIII-5430 Discussion Widget: Managers can't add topics when widget set to only managers can add topics
Merge pull request #1953 from bp323/SAKIII-5430

SAKIII-5430 Discussion Widget: Managers can't add topics when widget set to only managers can add topics
SAKIII-5428 Comment widget; All comments timestamps get updated to time when you change widget settings

Squashed commit of the following:

commit 1868cdc36c04af1e867c3d6b9d39d5cf18c2adcc
Merge: db7254e eb4d336
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Apr 11 11:27:27 2012 -0700

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

commit eb4d336f1d2c54ba8c4e6712ec2d6e6f45b89963
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Apr 11 12:13:48 2012 +0100

    SAKIII-5428 Discussion widget; All discussion timestamps get updated to time when you change widget settings

commit 232f6cb23d5f0badebe5a461e22c8f07b776a0db
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Apr 11 11:33:01 2012 +0100

    SAKIII-5428 Comment widget; All comments timestamps get updated to time when you change widget settings
Merge pull request #1952 from bp323/SAKIII-5428

SAKIII-5428 Comment widget; All comments timestamps get updated to time when you change widget settings
SAKIII-5431 - Disable creation of messages in edit mode - discussion
https://jira.sakaiproject.org/browse/SAKIII-5431
Merge remote-tracking branch 'origin/1.2.0'
SAKIII-5431 - Show message on top of the discussion in edit mode
https://jira.sakaiproject.org/browse/SAKIII-5431
SAKIII-5431 - Use 1 line for readability
SAKIII-5431 - Fix background image for disabled button
Merge pull request #1956 from christianv/SAKIII-5431

SAKIII-5431 - Disable creation of messages in edit mode - discussion
SAKIII-5439 - implement the :merge parameter
https://jira.sakaiproject.org/browse/SAKIII-5439
Merge pull request #1957 from christianv/SAKIII-5439

SAKIII-5439 - implement the :merge parameter