avancement
Merge branch 'master' of https://github.com/magikcypress/spip-plugins

Conflicts:
	monitor/prive/objets/liste/monitor.html