Merge branch 'feature/Danny' into develop
The worst day ever
Merge branch 'feature/Lars' into develop
Merge branch 'develop' of https://github.com/Danta1st/Med10Project into develop

Conflicts:
	Med10Project/ProjectSettings/ProjectSettings.asset
Merge branch 'develop' into feature/Danny
to many metafiles (Data.meta removed)