Merge branch 'release-v1' of https://github.com/Veeit/makerslog-App into release-v1 # Conflicts: # Makerlog.xcodeproj/project.pbxproj # Makerlog.xcodeproj/project.xcworkspace/xcuserdata/veitprogl.xcuserdatad/UserInterfaceState.xcuserstate