Update
Merge branch 'master' of https://github.com/liu-sheng/foobar

Conflicts:
	foobar/db/impl_sqlalchemy.py
	foobar/db/sqlalchemy/models.py