#2
merge
commit
commit
Merge branch 'master' of
https://github.com/souldmohamed/aladyn-2200350-3366822

Conflicts:
	aladyn-2200350-3366822/src/fr/upmc/aladyn/transactionables/context/MethodInvocationContext.java
	aladyn-2200350-3366822/src/fr/upmc/aladyn/transactionables/objets/Adress.java
	aladyn-2200350-3366822/src/fr/upmc/aladyn/transactionables/utils/Utils.java