Change
Merge branch 'develop-mators11' of https://github.com/oskopek/CryptoIM into develop-mators11

Conflicts:
	cryptoim/encryptor_core.py