Adj changes
Merge branch 'master' of github.com:MPBA/renette
Merge branch 'master' of github.com:MPBA/renette
updates
Solved first bug on netstab
Merge branch 'master' of github.com:MPBA/renette

Conflicts:
	engine/scripts/compute_netstab.py