Fix MergeDriverPacked
Annotation methods parsed
Slightly changed lib xmls in psiProject examples
Fixed bug in classifier scopes.