7
Merge remote-tracking branch 'origin/master'

Conflicts:
	coo-m-game/libs/readme.txt