Merge branch 'jobara-authorization-page'
Linting
Merge branch 'master' into login-page