Merge branch 'master' into feature/template
Add more styles to the app
Merge branch 'feature/template'