Merge branch 'hotfix/bug4'
Merge branch 'hotfix/MainMenu-bug' into ebook