[merge/bzr-gtk] added conflicts to olive menu, some trivial fixes

[Szilveszter Farkas]

Hi,

this bundle adds a Conflicts entry to the Branch menu of Olive, and
also fixes the olive-gtk launcher.

Cheers,
Szilveszter / phanatic

PS. sorry for spamming bzr.dev's BundleBuggy with my request, I hope
the situation will change/improve soon...