Merge remote-tracking branch 'upstream1/master'
Merge branch 'master' of https://github.com/sduskis/yoga
creating static filter.  Moving resources (js, css, html) into shared folder