Working on annotation view
Merge branch 'master' of https://github.com/catami/catami