Merge branch 'production'
fix export csv bug

undefined method `join' for nil:NilClass
Merge branch 'master' into production