changed log to info level
Merge branch 'dev' of github.com:intermine/intermine into dev
able to parse protein atlas xml #342
added config to merge web-model.xml and web.xml #313 #309
Indentation
merge web-bio.xml and web.xml #313 #309
Merge branch 'master' of git@github.com:ratmine/intermine into dev
Merge commit 'upstream/dev' into dev
updated to use 1.2.1
ignore p-value greater than 1
checkstyle
Merge branch 'dev' of git@github.com:intermine/intermine into intermine-1.2.1
a fix to #351
modified changes?
Merge branch 'dev' of git@github.com:intermine/intermine into dev
Merge branch 'intermine-1.2.1' of git@github.com:intermine/intermine into dev

Conflicts:
	bio/skeletons/mine/webapp/build.xml
a fix to #351
no change in file
Merge branch 'dev' into merge_updates
files  under dataconversion from the latest intermine1.2.1