Merge branch 'master' of github.com:nlplab/brat
Closes #1066 (diff mode: switch collections)