amélioration
Merge branch 'master' of https://github.com/ITKWeb/menottes

Conflicts:
	public/javascripts/services/network.js