Git merges in Moodle x.x.x by Jetha Chan

commit b1421abdb62b55590cd95c2a944bd6cebc7c54ef
Author: Jetha Chan <jetha@moodle.org>
Date:   Tue, 01 Apr 2014 15:45:12 +0800
Tag:    v2.7.0-beta

MDL-44770 editor_atto: moved table context menu

commit 0326b8314921565c71815b50c1ff3b6c963c6eb0
Author: Jetha Chan <jetha@moodle.org>
Date:   Wed, 26 Mar 2014 15:12:57 +0800
Tag:    v2.7.0-beta

MDL-42588 mod_scorm: option for displaying activity name

commit 74d2a9df6d1a17772ec3949b99c20a31b41aaa9f
Author: Jetha Chan <jetha@moodle.org>
Date:   Tue, 25 Mar 2014 15:33:06 +0800
Tag:    v2.7.0-beta

MDL-42588 mod_scorm: display activity name