GROOOSSES MODIFIS
merge
merge II : le retour
Merge branch 'master' of https://github.com/yastij/ResXY

Conflicts:
	src/model/items/LabItem.java
	src/model/items/LectureItem.java
	src/model/items/Tablets.java