Merge remote-tracking branch 'mathbdeb/bdeb' into local-test

Conflicts:
	lib/WeBWorK/ContentGenerator/Instructor.pm
	lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
	lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
ajout de maketext pour All Chapters
meme chose
Ajout de maketext
ajoute de fichier
Merge branch 'julie-test' of https://bitbucket.org/mathbdeb/webwork2 into julie-test

Conflicts:
	conf/webwork.apache2.4-config
	lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
ajout de apache2.4-config
Merge branch 'julie-test' of https://bitbucket.org/mathbdeb/webwork2 into julie-test
Merge branch 'julie-test' into CCDMD_H2015

Conflicts:
	lib/WeBWorK/Localize/fr.po