Fixed some random bugs and added some missing test cases to cli
Merge branch 'develop-mators11' of github.com:oskopek/CryptoIM into develop-mators11

Conflicts:
	tests/TestCli.py