cleanup
Merge branch 'feat_stream_style' of github.com:madepeople/magento-module into feat_stream_style