Merge branch 'release/1.5' into develop
Merge branch 'hotfix/tests' into develop
Merge branch 'master' of github.com:fikovnik/omnigraffle-export into develop
Updated version number
Merge branch 'release/1.5.1'