game-player - 99%
game-player - 99%
Merge branch 'master' of https://github.com/juliachvyrova/smartbullet

Conflicts:
	protected/components/Smiles.php