text, button frameworks
Merge remote-tracking branch 'origin/master'

Conflicts:
	CloudGame/images/gameimages/ready.png
text, button frameworks