wolala
Merge branch 'master' of bitbucket.org:yupbank/whispering

Conflicts:
	server/libs/exceptions.py
add mockredis
Merge remote-tracking branch 'upstream/master' into wola

Conflicts:
	pip-req.txt
specify version of mockredis
Merge pull request #1 from wooparadog/wola

添加测试