Fix app category and homepage
Merge branch 'develop'