code climate
Merge branch 'hotfix/codeclimate' into develop