fixed asset pipeline
Merge branch 'development'
fix the heroku asset pipeline
udpated prod env