Merge pull request #3 from hj7park/9077cac0789faa49b31c58843f2d6dd57312d933

Merge Jay's most recent changes to Canned Queries.
Graphical schedule; Query changes

Some initial work on supporting graphical schedules.
Changes to QueryParameters tables to support Jay's work with Canned
Queries.
Merge branch 'master-2'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Query.scala
	app/models/Query.scala
Merge branch 'master' into master-2
small
changes made thursday