Merge branch 'master' into csstheming

# Conflicts:
#	src/elements/PageTitle/PageTitle.module.css
#	src/elements/Preview/Preview.module.css
#	src/elements/SideBar/SideBar.module.css
#	src/index.css
#	src/pages/Player/Player.js
#	src/pages/Player/Player.module.css
#	src/pages/SettingsPage/SettingsPage.module.css

src/App.test.js

@@ -2,14 +2,6 @@ import React from 'react';
 import App from './App';
 import {shallow} from 'enzyme'
 
-function prepareFetchApi(response) {
-    const mockJsonPromise = Promise.resolve(response);
-    const mockFetchPromise = Promise.resolve({
-        json: () => mockJsonPromise,
-    });
-    return (jest.fn().mockImplementation(() => mockFetchPromise));
-}
-
 describe('<App/>', function () {
     it('renders without crashing ', function () {
         const wrapper = shallow(<App/>);
@@ -92,7 +84,7 @@ describe('<App/>', function () {
     });
 
     it('test initial fetch from api', done => {
-        global.fetch = prepareFetchApi({
+        global.fetch = global.prepareFetchApi({
             generalSettingsLoaded: true,
             passwordsupport: true,
             mediacentername: "testname"