overlay mechanism is ok
merged conflict in photooverview
showing 5 best tags now, removed unused icon
merged locally
autoformatted