25.5.
Merge branch 'master' of https://github.com/jodynek/jImage

Conflicts:

jImage.xcodeproj/project.xcworkspace/xcuserdata/jodynek.xcuserdatad/User
InterfaceState.xcuserstate