auth ewer
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/model/redis_db/base.py
content log