Merge branch 'master' of https://github.com/KDE/ocs-webserver

1. Conflicts:
2. application/modules/default/views/scripts/product/index.phtml
3. httpdocs/theme/react/product-media-slider/app/book-reader.js
4. httpdocs/theme/react/product-media-slider/app/product-media-slider.js
5. httpdocs/theme/react/product-media-slider/app/video-player.js
6. httpdocs/theme/react/product-media-slider/product-media-slider.js
7. httpdocs/theme/react/product-media-slider/style/product-media-slider.css
8. httpdocs/theme/react/product-media-slider/style/product-media-slider.less