Commit 399bc7840476d28699011e488089dc60a0b87644

  • Tree SHA1: 8af771d
  • Parent SHA1: 10b1159 (UI changes)
  • Parent SHA1: 2da84a7 (The annotation bar can now be shifted to top or bottom) 
Fixing merge conflicts from Anon