Fix styles
Merge branch 'master' into devel
Update icon! Christmas here!
Merge branch 'christmasIcon' into devel
Prepare for release 1.2.4
Merge branch 'release-1.2.4'