parent incoming
Merge branch 'nOperandOperation' into XML-export

Conflicts:
	Formular/src/org/formular/operation/AOperation.java
On peut importer des formules