putting things back

? Accidentaly deleted AnnoPanel
Attempt2
Merge branch 'master' of https://github.com/akaplan33/SymphonyInteractive

e362.