update
Merge branch 'master' of https://github.com/michbur/MBmca

Conflicts:
	R/print.diffQobject.R