Joystick support now works, full stop

Conflicts:
	src/engine/controller.cc
	src/engine/player.cc
Merge branch 'alpha' of github:Advael/GUFG into alpha

Conflicts:
	src/engine/controller.cc
	src/engine/player.cc