Major improvements in the player controller! Jumping, shooting etc..
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop

Conflicts:
	Assets/Prefabs/Canvases/Canvas.prefab
merge fixes