Model service now produces model tagged with display names
Reflect api change in new version
Lowered log levels, ensured everything gets closed
Reduce our expose to SQL injection attacks
Remove order by clause. It causes syntax errors.
Lowered log level
Eclipse is not very smart
Don't rebuild the db under the feet of a running webapp.
Merge branch 'beta' into annotated-model

Conflicts:
	intermine/objectstore/main/.classpath
Fixed sql-generator test
Merge branch 'beta' of github.com:intermine/intermine into annotated-model

Conflicts:
	testmodel/setup.sh
Merge pull request #672 from alexkalderimis/annotated-model

Model service now produces model tagged with display names
Merge branch 'beta' of github.com:intermine/intermine into browser-testing

Conflicts:
	testmodel/setup.sh