Merge branch 'MDL-44902_LTI_Addtions' of https://github.com/moodlerooms/moodle

Conflicts:
	mod/lti/version.php

diff --cc mod/lti/locallib.php
Simple merge

diff --cc mod/lti/settings.php
Simple merge

diff --cc mod/lti/version.php
index 3e6719e,1bd4e4d..b9db2d2
--- 1/mod/lti/version.php
--- 2/mod/lti/version.php
+++ b/mod/lti/version.php
@@@ -48,7 -48,7 +48,7 @@@
  
  defined('MOODLE_INTERNAL') || die;
  
- $plugin->version   = 2014051200;       // The current module version (Date: YYYYMMDDXX)
 -$plugin->version   = 2014050100;       // The current module version (Date: YYYYMMDDXX)
 -$plugin->requires  = 2013110500;    // Requires this Moodle version
++$plugin->version   = 2014060200;    // The current module version (Date: YYYYMMDDXX)
 +$plugin->requires  = 2014050800;    // Requires this Moodle version
  $plugin->component = 'mod_lti';        // Full name of the plugin (used for diagnostics)
  $plugin->cron      = 0;