merge from heroku master branch (minify js,css)