anorm.sql
asformurl
Query controller changed - error checking
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
Merge pull request #4 from hj7park/master

changes made thursday