Alex Rechtin
4c94cadf11
# Conflicts: # client/app/src/main/java/customUI/Button.java # client/app/src/main/java/customUI/Converter.java # client/app/src/main/java/customUI/Label.java # client/app/src/main/java/customUI/Tooltip.java # client/app/src/main/java/events/EditEventController.java # client/app/src/main/java/helper/SvgBtnCreator.java # client/app/src/main/java/main/MainController.java # client/data/src/main/java/container/Event.java # client/data/src/main/java/res/DataController.java # client/data/src/main/java/res/HttpRequest.java