addressed issue https://github.com/globaleaks/GlobaLeaks/issues/832
addressed issue https://github.com/globaleaks/GlobaLeaks/issues/829
use by default receipt of 16 numbers fixing https://github.com/globaleaks/GlobaLeaks/issues/823
Merge pull request #208 from globaleaks/fix_issue_832

addressed issue https://github.com/globaleaks/GlobaLeaks/issues/832
Merge pull request #209 from globaleaks/fix_issue_831

Fix issue 831
Merge pull request #207 from globaleaks/fix/issues/823

use by default receipt of 16 numbers fixing https://github.com/globaleak...
Fix admin unittest.
Merge pull request #210 from globaleaks/fix/issues/826

Fix/issues/826
Remove unneed CollectionToken import
addressed issue https://github.com/globaleaks/GlobaLeaks/issues/829
Merge branch 'fix_issue_829' of github.com:globaleaks/GLBackend into fix_issue_829

* 'fix_issue_829' of github.com:globaleaks/GLBackend:
  addressed issue https://github.com/globaleaks/GlobaLeaks/issues/829

Conflicts:
	globaleaks/utils/utility.py
Merge pull request #211 from globaleaks/fix_issue_829

addressed issue https://github.com/globaleaks/GlobaLeaks/issues/829
Replace PyCrypto with cryptography.

Implement some functions for handling random generation using os.urandom
Make the randint API consistent with random.
Fix bugs in cryptography branch.
Merge remote-tracking branch 'origin/feature/cryptography' into feature/cryptography

* origin/feature/cryptography:
  Make the randint API consistent with random.
  Replace PyCrypto with cryptography.

Conflicts:
	globaleaks/security.py
	globaleaks/tests/test_security.py
	globaleaks/utils/utility.py