Merge branch 'master' into heroku
[feature] inline Styles url convert