# Conflicts:
#	frontend/src/styles/form.scss

Merge in RIHA/riha-browser from RIHAKB-1095 to develop

Squashed commit of the following:

commit 7ee2bfe4
Author: makar <makar.shokarev@wisercat.net>
Date:   Fri May 6 14:46:23 2022 +0300

    Parandatud CSS stiilid

commit b3610355
Author: Kristjan Kruus <kristjan.kruus@ria.ee>
Date:   Fri May 6 09:44:28 2022 +0300

    README.md edited online with Bitbucket

commit 447f48cd
Author: Kristjan Kruus <kristjan.kruus@ria.ee>
Date:   Fri May 6 09:43:55 2022 +0300

    ScenarioContext.java edited online with Bitbucket

commit 86465bf0
Author: Kristjan Kruus <kristjan.kruus@ria.ee>
Date:   Fri May 6 09:41:23 2022 +0300

    README.md edited online with Bitbucket

commit e0157d1d
Author: makar <makar.shokarev@wisercat.net>
Date:   Thu May 5 14:20:02 2022 +0300

    Parandatud selenium testid

Merge in RIHA/riha-browser from RIHAKB-1095 to develop

Squashed commit of the following:

commit b3610355
Author: Kristjan Kruus <kristjan.kruus@ria.ee>
Date:   Fri May 6 09:44:28 2022 +0300

    README.md edited online with Bitbucket

commit 447f48cd
Author: Kristjan Kruus <kristjan.kruus@ria.ee>
Date:   Fri May 6 09:43:55 2022 +0300

    ScenarioContext.java edited online with Bitbucket

commit 86465bf0
Author: Kristjan Kruus <kristjan.kruus@ria.ee>
Date:   Fri May 6 09:41:23 2022 +0300

    README.md edited online with Bitbucket

commit e0157d1d
Author: makar <makar.shokarev@wisercat.net>
Date:   Thu May 5 14:20:02 2022 +0300

    Parandatud selenium testid

Merge in RIHA/riha-browser from RIHAKB-1095 to develop

* commit '35e37d15':
  CSS stiilide parandus
  Parandatud tirvalisuse blokki stiilid. Vahetatud kõikide input'ite värvid
  Parandatud märksõnade stiilid.

Merge in RIHA/riha-browser from RIHAKB-1100 to develop

* commit '1f6c5d33':
  spring-boot-starter-parent 2.6.6
  Updated spring boot version to 2.6.6
  Moved bean to another class
  Removing deprecated annotation
  Updated all backend dependencies
  Fixed standard system choosing css style
  Fixing css styles
  Removed z-index
  Upgraded bootstrap version. Fixed errors
  Downgraded bootstrap version
  Changed readme
  Upgraded all dependencies in frontend
  Fixed ngs-ui-switch dependency error

This reverts commit 18e80a04.