SAKIII-3871 changed private label when setting content permission
SAKIII-5344 fix spelling mistake
SAKIII-5335 Create area for activity widget in a group and implement the dummy JSON feed, SAKIII-5365 Create HTML/CSS for tabs on content profile page and embed the dashboard activity widget

Squashed commit of the following:

commit cef7ae41a93e251a1e996f9d9dd113fea0713118
Merge: cf7ad51 25e35f4
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Thu Mar 29 22:27:52 2012 -0700

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

commit 25e35f4eb8ba2bb7b4805ec022cc584daf83cec0
Merge: 7004c70 f762bcc
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 28 09:42:51 2012 +0200

    Merge remote-tracking branch 'origin/master' into SAKIII-5335

commit 7004c70783aa164ce80a91f3352f2b02d5df0842
Merge: 12bb1eb 1627fb5
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 28 09:41:45 2012 +0200

    Merge origin/master and fix conflicts

commit 12bb1eb38f88280b8e5f240d2a41d8290a0e5c36
Merge: b736de2 affaee8
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 28 09:36:35 2012 +0200

    Merge remote-tracking branch 'origin/1.2.0' into SAKIII-5335

commit b736de2bd25b2711472a1d53331660ca08bf0f79
Merge: d70976f e1eb74e
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Mar 27 09:58:40 2012 +0200

    Merge branch 'SAKIII-5317' into SAKIII-5335

commit e1eb74e6040f79a9d9052c5542f34f8de8567876
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Mar 27 09:58:15 2012 +0200

    SAKIII-5317 Fixes per comment on Github

commit 34fa66eb80222bf889b3e42d820da44b37d971db
Merge: 33194de afe197f
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Mar 27 09:40:08 2012 +0200

    Merge remote-tracking branch 'origin/master' into SAKIII-5317

commit d70976fefcd87c4aa3b44a20d265ec9d13c006c6
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Mar 26 16:53:54 2012 +0200

    SAKIII-5365 Create HTML/CSS for tabs on content profile page and embed the dashboard activity widget

commit 7a860cecb10e0555a7e974a1eec8a1610b78b06c
Merge: ad17b7f 381d4cc
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Mar 26 14:03:26 2012 +0200

    Merge remote-tracking branch 'origin/master' into SAKIII-5335

commit ad17b7fa2cfdcb8032afe87f3882de4be07270b3
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Mar 26 09:46:53 2012 +0200

    SAKIII-5335 Create area for activity widget in a group and implement the dummy JSON feed

commit 159dc182fb17f947649e4b606e50a21a81f0af1c
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Mar 26 09:30:59 2012 +0200

    SAKIII-5335 Add the dashboardactivity widget to the group templates

commit 835cb07c77a5170208d0f62e404388ea2888f72c
Merge: 33194de 2863b45
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Mar 26 08:47:03 2012 +0200

    Merge remote-tracking branch 'origin/master' into SAKIII-5335

commit 33194deb62de5c54bd6efcc0b02171975d80e802
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Mar 26 08:16:00 2012 +0200

    SAKIII-5317 Fixes per comment on Github

commit 3a94c8e374831dacce8be375ead909c341f49537
Merge: a2e7ba1 7c788ed
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Mon Mar 26 08:07:54 2012 +0200

    Merge remote-tracking branch 'origin/master' into SAKIII-5317

commit a2e7ba1fc2ee48fa7d74625007deb21f0611d1ae
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Mar 20 15:38:26 2012 +0000

    SAKIII-5317 Implement the dashboard activity feed

commit 296a78467ac13e1961439b6971b7c8f54688ed97
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Mon Mar 19 20:38:24 2012 -0700

    SAKIII-5316 - Create dummy JSON feed for dashboard activity widget
    https://jira.sakaiproject.org/browse/SAKIII-5316
Merge pull request #1919 from bp323/SAKIII-5335

SAKIII-5335 Create area for activity widget in a group and implement the dummy JSON feed, SAKIII-5365 Create HTML/CSS for tabs on content profile page and embed the dashboard activity widget
Merge pull request #1928 from jsloane/SAKIII-5344

SAKIII-5344 fix spelling mistake

* jsloane/SAKIII-5344:
  SAKIII-5344 fix spelling mistake