smile
Merge origin/master

Conflicts:
	protected/components/Smiles.php