Merge branch 'fixes' into develop

Prepared app for new hotfix release.

New release

Created Tag for version: 7.39.48.260

Created Tag for version: 7.38.48.259

Created Tag for version: 7.37.48.258

Hotfixes release.

Fixed issue: jarrodek#676
Fixed issue: jarrodek#769

Created Tag for version: 7.36.48.258

Created Tag for version: 7.36.47.258