new
修改bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	torngas/db/dbalchemy.py
userservice