For pull requests
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Query.scala
	app/models/Query.scala
	app/models/persist/OatMapper.scala
Merge pull request #3 from hj7park/9077cac0789faa49b31c58843f2d6dd57312d933

Merge Jay's most recent changes to Canned Queries.