try rails serve_static_assets option
Merge branch 'master' into release