Small changes
Merge branch 'master' into daniel
made the gui render on a separate camera and made it dpi dependent
GUI dpi dependent
lobby id typ klar
Merge branch 'master' into sean
strlk knapp
new better(more or less finished) collision.
Merge branch 'daniel' of https://github.com/Omnes/Bananas into daniel

Conflicts:
	Assets/Scenes/test_danielNew.unity
	Assets/Scripts/LeafManager.cs
	Assets/Scripts/MovementLogic.cs
	Assets/Scripts/playerCollision.cs
	ProjectSettings/EditorBuildSettings.asset
Merge branch 'master' into daniel

Conflicts:
	Assets/Scripts/MovementLogic.cs
	Assets/Scripts/playerCollision.cs
mjeh buttonfix
Merge branch 'master' into sean
small mergefixes
Merge branch 'daniel'
Merge branch 'master' into johannes

Conflicts:
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/ProjectSettings.asset