Merge branch 'master'
Conflicts:
	src/esgi/amac/plugins/notes/NotesPlugin.java
Merging