baga
sqlite
nimei
Merge branch 'dev'

Conflicts:
	app/api_1_0/orders.pyc
	app/models.pyc
restaurants
api/init
debug
forward
nimie
Merge branch 'master' of github.com:ligulfzhou/flask-restaurant