recovery: initial commit
Merge branch 'master' into iterators

Conflicts:
	bindings/python/elliptics_python.cpp
	include/elliptics/cppdef.h