Merge branch 'develop'
Fixed issue with ratings
Merge branch 'master' into develop