Trying to merge a branch with a bug fix, but i made a mistake
Trying to merge a branch with a bug fix, but i made a mistake

Merge branch 'release'

SlideAtlas/SlideAtlas-Server,SlideAtlas/SlideAtlas-Server,SlideAtlas/SlideAtlas-Server,SlideAtlas/SlideAtlas-Server