Signed-off-by: Mattanjah <djsnayper@gmail.com>
Merge branch 'master' of github.com:Vistritium/Supermarket

Conflicts:
	backend/api/src/test/java/FinanceManagementTest.java
Merge branch 'master' of github.com:Vistritium/Supermarket