Merge branch 'master' of github.com:MPBA/renette

Conflicts:
	engine/scripts/compute_adj.py
Merge branch 'master' of github.com:MPBA/renette