small changes
Merge branch 'master' of https://github.com/wpfff/diamond-analysis

Conflicts:
	lib/m2/ssro/mbi.py