merge beta into emma
Merge branch 'emma' of github.com:intermine/intermine into emma