Disabled achievements plugin
Merge branch 'master' into production