keyboard/controller at same time, dropdown pathing
more to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Aegis/Assets/Art/Promotional.meta
	Aegis/Assets/Art/Props and Environment/DemoTerrain.meta
	Aegis/Assets/Art/Props and Environment/DemoTerrain/Materials.meta
	Aegis/Assets/Art/Props and Environment/DemoTerrain/terr1.obj.meta
	Aegis/Assets/Art/Props and Environment/DemoTerrain/terr2.obj.meta
	Aegis/Assets/Levels/SurfaceLevel.unity
	Aegis/Assets/Prefabs/Paths.meta