-removed obsolete annotators
-added back needed descriptors
Merge branch 'master' of https://github.com/11791-5/project-team5.git