Merge branch '1.2.0' into ca12

* 1.2.0:
  SAKIII-5035 Set the date correctly when the UTC clock rolls over
  SAKIII-5014 Use the API to get the user picture
  SAKIII-4990 Escape the content URL in the search macro
  SAKIII-4869 Use the API to get a user's name
  SAKIII-4995 Added a few safeOutputs to recentcontactsnew and recentmemberships
  SAKIII-4993 safeOutput group title in entity widget and in the mylibrary widget

Conflicts:
	dev/javascript/user.js
	devwidgets/mylibrary/javascript/mylibrary.js
Merge branch 'versions' into contentauthoring

* versions:
  SAKIII-4902 - Page Revisions does not work
  NOJIRA - Fixing version URL
  SAKIII-4902 - Page Revisions does not work
SAKIII-5081 The cursor and click area on the collector are misleading
NOJIRA Revert inserterbar changes
Merge origin/contentauthoring and fix conflicts
SAKIII-5094 Style for title widget differs in edit mode
SAKIII-4629 Allow embedding of collections in pages

Squashed commit of the following:

commit 034ce2b6ac1003991e09801baff355108a8327ca
Merge: cbbe1af 78e117c
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Wed Feb 29 13:36:09 2012 -0800

    Merge remote-tracking branch 'christianv/SAKIII-4629' into christianv-SAKIII-4629

commit 78e117c8083ff01433128c3d07539874602bccac
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Fri Feb 24 16:45:16 2012 -0800

    SAKIII-4629 - fix name for collection back

commit 79fc01c4de11ccd38d3a2953f4e12a5c09a9534e
Merge: 2ed45c3 a396b39
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Fri Feb 24 14:07:07 2012 -0800

    SAKIII-4629 - Fix merge conflict

commit 2ed45c39e732c73212a6c20febdf95da11b7b68d
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Thu Feb 16 10:52:11 2012 -0800

    SAKIII-4629 Allow embedding of collections in pages
    Jira: https://jira.sakaiproject.org/browse/SAKIII-4629
Merge pull request #1701 from christianv/SAKIII-4629

SAKIII-4629 Allow embedding of collections in pages
SAKIII-5068 Get the latest docstructure before overwriting it when adding a subpage to a sakaidoc

Squashed commit of the following:

commit 4bc7f5f79e84ed0dcd6ff4f169aa9717d055379f
Merge: 69a79da d947693
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Wed Feb 29 13:52:29 2012 -0800

    Merge remote-tracking branch 'croby/SAKIII-5068' into croby-SAKIII-5068

commit d947693d273c4304af9dccbbc3104cf9901d8721
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Wed Feb 29 13:44:41 2012 -0800

    SAKIII-5068 Fixing JSLint errors

commit 08f18e4c5c2f7aef560baa2c3553bfb35c4a1e00
Merge: fee693a cbbe1af
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Tue Feb 28 15:51:42 2012 -0800

    Merge branch '1.2.0' of github.com:sakaiproject/3akai-ux into SAKIII-5068

commit fee693a77a4daca2aecdfac2054b242828697e35
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Mon Feb 27 14:51:49 2012 -0800

    SAKIII-5068 Get the latest docstructure before overwriting it when adding a subpage to a sakaidoc
Merge pull request #1721 from croby/SAKIII-5068

SAKIII-5068 Get the latest docstructure before overwriting it when adding a subpage to a sakaidoc
Merge branch '1.2.0'
Merge pull request #1694 from croby/SAKIII-4979

SAKIII-4979 Adding some escaping to the carousel

* croby/SAKIII-4979:
  SAKIII-4979 Adding some escaping to the carousel
Merge branch '1.2.0'
NOJIRA - Following up on code review
NOJIRA - Following up on code review
Merge branch '1.2.0' into ca12

* 1.2.0:
  SAKIII-5068 Get the latest docstructure before overwriting it when adding a subpage to a sakaidoc
  SAKIII-4629 Allow embedding of collections in pages
  SAKIII-4979 Adding some escaping to the carousel

Conflicts:
	dev/javascript/content_profile.js
	devwidgets/collectionviewer/css/collectionviewer.css
	devwidgets/lhnavigation/javascript/lhnavigation.js
Merge pull request #1723 from stuartf/SAKIII-5073

SAKIII-5073 upgrade MathJax to 2.0

* stuartf/SAKIII-5073:
  SAKIII-5073 upgrade MathJax to 2.0
SAKIII-5090 fix issues with sorting search results and content search
NOJIRA - Resolving merge conflict
NOJIRA - Following up on code review