Merge pull request #4 from hj7park/master

changes made thursday
Graphical schedule
Merge branch 'master' of github.com:bwbecker/oat

Conflicts:
	app/models/persist/OatMapper.scala
Get canned query parameters going.

Changes to OatMapper and the parsers so the object is correctly
constructed.
Rework the Query controller to be more functional and OO.
css and htmls
Merge branch 'master' into master-2