Merge branch 'master' of github.com:hello-nyxo/nyxo-app into feat/add-apollo