Merge branch 'hotfix/addshowcasepage'
Fix showcase view
Merge branch 'hotfix/fixfaq' into develop