# Conflicts:
#	UnicadoGUI/Frontend/src/routes/model/+page.svelte

# Conflicts:
#	UnicadoGUI/Backend/main.py
#	UnicadoGUI/Backend/requirements.txt
#	UnicadoGUI/Frontend/package-lock.json
#	UnicadoGUI/Frontend/package.json
#	UnicadoGUI/Frontend/src/lib/index.ts
#	UnicadoGUI/Frontend/src/routes/+layout.svelte
#	UnicadoGUI/Frontend/src/routes/+page.svelte
#	UnicadoGUI/Frontend/src/routes/model/+page.svelte
#	UnicadoGUI/Frontend/src/routes/settings/+page.svelte

# Conflicts:
#   UnicadoGUI/Frontend/src/routes/model/+page.svelte

used tabs for the diffrent objects in the aircraft_exchange_file, also using a store for the setting data

chnaged deleteProjectByNameButton to have a dropdown, also added a confirmation dialog before deleting

bugfix wrong url

New UnicadoGUI Branch

See merge request !1

add comments

add exampale settings of modules