Merge branch 'master' into develop
Refactored ratings
Merge branch 'develop' into master