small changes
Merge branch 'master' of https://github.com/pnic/Bachelor
Almost done annotation panels