production mode fix for asset pipeline
fixed runtime errors
fixed merge