Commit avant le grand pull
Merge branch 'master' of https://github.com/phacks/TeXaS

Conflicts:
	TeXasTry/bin/formule/BoutonInsererItem.class
	TeXasTry/bin/formule/ContenuItemTexte$1.class
	TeXasTry/bin/formule/Formule.class
	TeXasTry/bin/formule/Item.class
Je ne comprends rien à GIT. Merci de votre compréhension.
Merge branch 'master' of https://github.com/phacks/TeXaS

Conflicts:
	TeXasTry/bin/EcranEditionCentral/ContenuEditable.class
	TeXasTry/bin/EcranEditionCentral/EcranEditionCentral.class
	TeXasTry/bin/EcranEditionCentral/EditeurParagraphe.class
	TeXasTry/bin/EcranEditionCentral/EditeurTitre.class
Merge branch 'master' of https://github.com/phacks/TeXaS

Conflicts:
	TeXasTry/bin/EcranEditionCentral/ContenuEditable.class
Faut pas manger le caca des lapins