Changed query dialect
Merge remote-tracking branch 'origin/master'

Conflicts:
	webapp.py

Fixed conflict