Merge branch 'master' of https://github.com/mkeita/webcttomoodle.git
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/mkeita/webcttomoodle.git

Conflicts:
	WebCTToMoodlePlugin/webcttomoodle/classes/model/WebCTModel.php
Merge branch 'master' of https://github.com/mkeita/webcttomoodle.git
ActivityRessource
test
Merge branch 'master' of https://github.com/mkeita/webcttomoodle

Conflicts:
	WebCTToMoodlePlugin/webcttomoodle/classes/model/GlobalModel.php
	WebCTToMoodlePlugin/webcttomoodle/classes/model/activities/Folder.php