fix bug
query in
test data for angularjs
Merge branch 'master' of ssh://github.com/sunzhongwei/config

Conflicts:
	Templates/test_sqlalchemy.py