fix folders controller spec
Merge branch 'master' into production
try deploy