Bump version to 1.4
mac about: Fix background image stretch
Reduce file sizes of images once again
controller: Update message shown on conflicts
repo git: Solve conflicts by merging, instead of rebasing. Fixes #1106