more AA
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	gslib/game.py
Merge remote-tracking branch 'origin/master'
more joystick support