changed log to info level
Merge branch 'dev' of github.com:intermine/intermine into dev
able to parse protein atlas xml #342
closes #363
Merge branch 'intermine-1.2.1' of github.com:intermine/intermine into intermine-1.2.1
closes #356
closes #357
Refactored the bag status queries, and added a general method.
Don't upgrade if already upgrading
Whoops - forgot a bang
Don't wait for upgrades in webservice requests. It is stupid
added config to merge web-model.xml and web.xml #313 #309
added config to merge web-model.xml and web.xml #313 #309
Merge branch 'intermine-1.2.1' of github.com:intermine/intermine into intermine-1.2.1
Indentation
merge web-bio.xml and web.xml #313 #309
merge web-bio.xml and web.xml #313 #309
ignore p-value greater than 1
checkstyle
a fix to #351