hero carousel updates
Merge branch 'master' of https://github.com/atongen/owc
fixing conflict