merge web-bio.xml and web.xml #313 #309
a fix to #351
Merge remote branch 'upstream/intermine-1.2.1' into jw
* Added variation type to model and mapping
* added variation preprocessing detail:
if(m[<(\w+)></(\w+)>]){
  if($1 eq $2){
    s[<(\w+)></(\w+)>][$1];
  }
}
minor changes
Merge remote branch 'origin/jw' into jw
added proteins.motifs and new motifs type