Minor changelog update.
Updated readme for release.
updated russian translation for current template.pot
Implemented local branch merging during update.

I'm sure I did this before, I must have discarded it by mistake... Also
removed update retry, as there's some permissions issue that occurs with
the repo packfiles whenever it is done.
Wasn't evaluating merge analysis flags correctly.
updated template.pot (added some new strings)
updated russian translation
updated template.pot and russian translation
Merge branch 'master' of github.com:loot/loot into german-translation
Updated German translation of loot.po for latest change to template.pot.