Merge branch 'master' of https://github.com/urgelacko/cashregister

Conflicts:
	frontend/src/main/java/com/zh/cashregister/frontend/CashregisterApplication.java
Merge branch 'master' of https://github.com/urgelacko/cashregister