addressed issue https://github.com/globaleaks/GlobaLeaks/issues/832
use by default receipt of 16 numbers fixing https://github.com/globaleaks/GlobaLeaks/issues/823
Fix conflicts in devel