Merge branch 'release/1.5' into develop
Merge branch 'hotfix/alertSorting' into develop
Forgot the . in the version number… fixed.
Merge branch 'develop'