Added self.error to compute_adj script
Merge branch 'master' of github.com:MPBA/renette

Conflicts:
	engine/models.py