MERGE!
Merge branch 'master' of https://github.com/indiajuliet/kuwasys.git

Conflicts:
	src/main/java/de/schillerschule/kuwasys20/Controller/kuwasysControllerBean.java
	src/main/java/de/schillerschule/kuwasys20/Database/DatabaseHandler.java