update
Merge branch 'master' of github.com:proycon/colibri-mt

Conflicts:
	scripts/colibri-mt-exp.sh
fix