Additional Alpha mode coding
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/game_data.yaml