Updated to the latest version from Martin Malik.
Merge remote-tracking branch 'upstream/master' into fixVoot
Indentation fixes and removal of unused texts.
Lang fixes.
Last lang change.
Merge pull request #295 from tauceti2/fixVoot

Latest changes/bugfixes from Martin Malik.