Elliptics 24 support
Merge branch 'derikon' into current

Conflicts:
	debian/control
	src/proxy.cpp
Fixed build errors