inital bug fixing
merged with master
merge with master
Major cleanup of file structure
attempting to fix conflict
attempting to fix a confilct
removing added github merging syntax
removing faulty backup script
Adding french translation
Fix for broken images in label
minor updates
Updating version number
Fix for broken images in labels
removing faulty backup code
Updating Version Number
Merge branch 'master' into MOODLE_22_STABLE
Updating version number
rolling back error
Start of Moodle 2.3.1 development
Include format.js to get AJAX drag and drop working.