good methods networks
drag + networks
merge
merge
oupsMerge branch 'master' of https://github.com/ITKWeb/menottes

Conflicts:
	public/views/logged.html