Renamed query on model.
Merge branch 'master' of github.com:mtth/flasker

Conflicts:
	flasker/ext/api.py