SAKIII-5293 Replace the old path in the tmp widget data with the new path upon save
SAKIII-5210 add resourceType and change messagebox in comments to prevent the messages from going in the sent box
Merge pull request #1880 from croby/SAKIII-5210

SAKIII-5210 add resourceType and change messagebox in comments to prevent the messages from going in the sent box

* croby/SAKIII-5210:
  SAKIII-5210 add resourceType and change messagebox in comments to prevent the messages from going in the sent box
SAKIII-2549 fix jscoverage

Squashed commit of the following:

commit 00e05d831de522b402fe8354b73b3dea935f8fc8
Merge: 79757a8 350c25f
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Mar 14 20:36:31 2012 -0700

    Merge remote-tracking branch 'jsloane/SAKIII-2549' into jsloane-SAKIII-2549

commit 350c25f13d145c993822c3d8092411607377fadf
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Feb 9 11:11:18 2012 +1100

    SAKIII-2549 reverse some relative link changes

commit 67eebb42523118b1dd30dd45e15b7a482d3ec40e
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Jan 19 14:43:40 2012 +1100

    SAKIII-2549 dont need to change requirejs baseurl to a relative url

commit 2f9a478a18e1bf96dee0d4cfb34cc654b4c4a50a
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Jan 19 14:42:17 2012 +1100

    SAKIII-2549 dont need to change requirejs baseurl to a relative url

commit f4cbf7855d64c15a0a688fa850a51059d78ba4d0
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Jan 19 14:13:51 2012 +1100

    SAKIII-2549 fix jscoverage
Merge pull request #1578 from jsloane/SAKIII-2549

SAKIII-2549 fix jscoverage
SAKIII-5011 - add  sakai-entitypicture attribute to add contact in carousel
Merge pull request #1621 from croby/SAKIII-4853

SAKIII-4853 Make language and location options configurable
Merge pull request #1624 from croby/SAKIII-4856

SAKIII-4856 Provide the ability to configure the widget lists
SAKIII-4858 Enable configuration of the index.html/explore page
Merge branch 'master' of github.com:sakaiproject/3akai-ux into SAKIII-4859

Conflicts:
	devwidgets/accountpreferences/css/accountpreferences.css
	devwidgets/accountpreferences/javascript/accountpreferences.js
SAKIII-1973 Adding the ability to set a custom set of i18n properties that override all others in the system
This can be used for institutional overrides of i18n values
The properties in the custom.properties file override any other value of that property in the system
Merge pull request #1630 from croby/SAKIII-4861

SAKIII-4861 Allow links to be placed on the right side of the top naviga...
SAKIII-4124 applying patch SAKIII-4124.patch.txt supplied in Jira

Squashed commit of the following:

commit 240fcee9ecac4d624ec09c66a704fbb673f52f8b
Merge: f213ab6 87421ab
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Thu Mar 15 14:16:08 2012 -0700

    Merge remote-tracking branch 'jsloane/SAKIII-4124' into jsloane-SAKIII-4124

commit 87421abf7e9829a39c4c70f648ff119505ea147b
Merge: 9d8d5d2 7a5b5d6
Author: James Sloane <jsloane@csu.edu.au>
Date:   Wed Feb 22 11:21:12 2012 +1100

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

    * 'master' of github.com:sakaiproject/3akai-ux: (66 commits)
      NOJIRA Changing path to jscoverage js as it was 404'ing for me suddenly, causing an error in the cleanjs test Not sure why this started happening all of a sudden - Also changed up the jscoverage js file to use require.js and to properly target the correct link
      SAKIII-5005 fix styling issue when user can't edit
      SAKIII-5016 fix styling issue
      SAKIII-5025 - speech support for main search https://jira.sakaiproject.org/browse/SAKIII-5025
      SAKIII-5008 - Fix join worlds from dashboard https://jira.sakaiproject.org/browse/SAKIII-5008
      SAKIII-5009 - Add area screen has wild-floating _List Categories_ link
      SAKIII-5012 add jquery.tagcloud to sakai.dependencies
      SAKIII-4999 - Fix Gritter message - LTI widget https://jira.sakaiproject.org/browse/SAKIII-4999
      SAKIII-4965 - fix document click on page edit https://jira.sakaiproject.org/browse/SAKIII-4965
      SAKIII-4992 Add configuration option to enable/disable branding widget
      SAKIII-3821 removed unused config properties
      SAKIII-4988 enable mark as read button only if unread messages are selected
      SAKIII-4822 - My Messages inbox _reply_ links and _delete message_ butto...
      SAKIII-2824 use jeditable in contentmetadata widget
      Sakiii 4796b - Better default remote content widget
      SAKIII-4801 update detect_timezone to latest version
      SAKIII-4237 add text to search button
      SAKIII-4671 fix bug when group option not disabled after adding collection to group
      SAKIII-4628 fix bug with certain characters in profile input fields
      SAKIII-4624 fix css issues with contacts and memberships grid view
      ...

commit 9d8d5d238a40770978e910d2f712c6f13ff642cb
Author: James Sloane <jsloane@csu.edu.au>
Date:   Wed Feb 22 11:17:23 2012 +1100

    SAKIII-4124 check browser type outside of ajax function

commit d5e93a45775054e4342072ca736cb49233ca0dc1
Author: James Sloane <jsloane@csu.edu.au>
Date:   Tue Feb 7 10:14:29 2012 +1100

    SAKIII-4124 applying patch SAKIII-4124.patch.txt supplied in Jira
Merge pull request #1634 from jsloane/SAKIII-4124

SAKIII-4124 applying patch SAKIII-4124.patch.txt supplied in Jira
Merge pull request #1628 from croby/SAKIII-4859

SAKIII-4859 Allow the email in the basic profile to be displayed and edi...
Merge pull request #1883 from gsilver/SAKIII-5011

SAKIII-5011 - add  sakai-entitypicture attribute to add contact in carou...

* gsilver/SAKIII-5011:
  SAKIII-5011 - add  sakai-entitypicture attribute to add contact in carousel
SAKIII-4656 display loading indicator when loading collection items

Squashed commit of the following:

commit 1eabb46236b8f0168ff445d64e6248f3358665f6
Merge: 68d26a7 8c176b0
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Thu Mar 15 17:00:57 2012 -0700

    Merge remote-tracking branch 'jsloane/SAKIII-4656' into jsloane-SAKIII-4656

commit 8c176b0f9691055a78a3a3f39ef7768fc660c573
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Mar 15 15:26:53 2012 +1100

    SAKIII-4656 display loading indicator when loading collection items

commit 341307c5ca8439885fb1d43a30659cb13d89fe2d
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Mar 15 15:20:32 2012 +1100

    SAKIII-4656 display loading indicator when loading collection items
Merge pull request #1882 from jsloane/SAKIII-4656

SAKIII-4656 display loading indicator when loading collection items
SAKIII-4860 Enable the ability to configure an internal and an external login system at the same time
Merge branch '1.2.0'