Yolo
Merge branch 'master' of ssh://git@github.com/quenti77/AMAC.git

Conflicts:
	src/esgi/amac/plugins/notes/NotesPlugin.java