changed names of buttons to tileX
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_game_screen.xml
Only merged game_colors.xml