Merge branch 'provide_ret'

Conflicts:
	armonic/client/smart.py
[WIP] Change multliplicity replay format