Merge pull request 'Add PWA config' (#329) from pwa into develop