Separating annotation UI for file scale and broad scale.
Merge branch 'master' of https://github.com/catami/catami