SAKIII-5556 Replacing content permissions notification to delimit multiple users with the word 'and' instead of with commas.
https://jira.sakaiproject.org/browse/SAKIII-5556
SAKIII-5556 Fixing content permissions notification to separate each user
with a comma except for the last 2, which will use the word 'and'. (e.g. 'User1, User2 and User3')
https://jira.sakaiproject.org/browse/SAKIII-5556
SAKIII-5556 Cleaning up content permissions notification with
underscore.js
https://jira.sakaiproject.org/browse/SAKIII-5556
SAKIII-5556 Converted quotes on touched lines to single quotes.
https://jira.sakaiproject.org/browse/SAKIII-5556
SAKIII-5556 Merging in 1.5.0 changes to avoid merge conflict.
https://jira.sakaiproject.org/browse/SAKIII-5556
SAKIII-4921 - BasicLTI widget sends relatively useless context_id
https://jira.sakaiproject.org/browse/SAKIII-4921
Merge pull request #2266 from christianv/SAKIII-4921

SAKIII-4921 BasicLTI widget sends relatively useless context_id
SAKIII-3583 display an error message when trying to save a document that was deleted

Squashed commit of the following:

commit 817b04c9e0028c7a832ee46097c008df926ae044
Merge: e64caf6 5ca76aa
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Jul 25 16:25:42 2012 -0700

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

commit 5ca76aac2b2be50c8d7afc9eb78c5899d1301e49
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu May 3 15:32:34 2012 +1000

    SAKIII-3583 hide inserterbar if error saving page

commit 4d5d26bfa67ab576d211797e31cf01d7373ca5ee
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Apr 26 13:25:53 2012 +1000

    SAKIII-3583 fix issues with errors not displaying

commit a8dfa6062d1c172e028777f0ea1b874ad1f6d62a
Merge: a754384 dc512b3
Author: James Sloane <jsloane@csu.edu.au>
Date:   Tue Apr 17 11:23:56 2012 +1000

    SAKIII-3583 resolved merge conflicts

commit a7543842691c42c96747870350b9256570c1bdd5
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Apr 5 09:37:38 2012 +1000

    SAKIII-3583 SAKIII-4260 added save successful message

commit fbafd5ac97f2b3763a489388e8ed986404b0b5d2
Merge: 9cab6cf c6a19b4
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Apr 5 09:31:38 2012 +1000

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

    * 'master' of git://github.com/sakaiproject/3akai-ux:
      SAKIII-5240 changed width of error span in discussion widget
      SAKIII-3584 added punctuation to add group member message
      SAKIII-4650 update library and page title when group name is changed
      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
      SAKIII-5344 fix spelling mistake
      SAKIII-5326 changes per code review - spacing/single quotes
      SAKIII-5326 change per code review
      SAKIII-5326 fix unit test error
      SAKIII-5326 work on adding editor role to content and collections
      SAKIII-5326 add ability to assign editor role for content
      SAKIII-5326 add ability to assign editor role for content

commit 9cab6cf50a7a33b0c8eaddadbaa682808c712149
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Mar 29 10:43:20 2012 +1100

    SAKIII-3583 changed error messages depending on error code

commit e00f4916ef4511136bde358e9cac222d81a37b6a
Merge: a969454 cf7ad51
Author: James Sloane <jsloane@csu.edu.au>
Date:   Thu Mar 29 10:39:05 2012 +1100

    SAKIII-3583 resolved merge conflict and changed error messages depending on error code

commit a969454ea1a035ce1b2426bf21becfa0d8bcccf2
Author: James Sloane <jsloane@csu.edu.au>
Date:   Mon Mar 26 14:46:47 2012 +1100

    SAKIII-3583 display an error message when trying to save a document that was deleted
Merge pull request #2028 from jsloane/SAKIII-3583

SAKIII-3583 display an error message when trying to save a document that was deleted
SAKIII-5556 - Content permissions notification should say 'user1 and user2', not 'user1, user2'
https://jira.sakaiproject.org/browse/SAKIII-5556

Merge remote-tracking branch 'apex13/SAKIII-5556' into SAKIII-5556

Conflicts:
	devwidgets/newsharecontent/javascript/newsharecontent.js
SAKIII-5434 check username contains valid characters
SAKIII-5476 fix heading boldness
SAKIII-5483 changed heading sizes