SAKIII-4861 Fixes per code review
SAKIII-4859 Fixes per code review
Merge branch '1.2.0'

Conflicts:
	devwidgets/inserter/javascript/inserter.js
SAKIII-5286 fix IE8 bug in mymemberships
SAKIII-5291 - MoreWidgets display as vertical list instead of in carousel
https://jira.sakaiproject.org/browse/SAKIII-5291
Merge pull request #1876 from christianv/SAKIII-5291

SAKIII-5291 - MoreWidgets display as vertical list instead of in carousel

* christianv/SAKIII-5291:
  SAKIII-5291 - MoreWidgets display as vertical list instead of in carousel https://jira.sakaiproject.org/browse/SAKIII-5291
SAKIII-4074 display error message if no page available

Squashed commit of the following:

commit 983b9ea9fbee1a0837bf23d50cba5c9e0d2351a5
Merge: 909159e b6f2fbe
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Tue Mar 13 16:18:29 2012 -0700

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

commit b6f2fbe3b5f487d0b641dea712714378d5cdad83
Author: James Sloane <jsloane@csu.edu.au>
Date:   Wed Mar 14 09:27:39 2012 +1100

    SAKIII-4074 use i18n key for page unavailable message

commit 0852130cb405d6256fa0a5b2f442239124166b90
Author: James Sloane <jsloane@csu.edu.au>
Date:   Tue Mar 13 17:05:16 2012 +1100

    SAKIII-4074 display error message if no page available
Merge pull request #1870 from jsloane/SAKIII-4074

SAKIII-4074 display error message if no page available
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...