started deletion of pop-it button
Merge branch 'master' of https://github.com/High5Apps/penn-caps-client
refactoed annotationView
Revert "started deletion of pop-it button"

This reverts commit d569e5e10758c433e5fdfa462ac9ca702901b2c7.
Merge branch 'master' of https://github.com/High5Apps/penn-caps-client