Broke all cli tests, because returning values from do_ methods in cli breaks cmdloop()
Merge branch 'develop' of github.com:oskopek/CryptoIM into develop

Conflicts:
	cryptoim/cli.py
	tests/TestCli.py