commity
Merge commit '49962962936acdf842e5075334d57ba3fe5bcf46'

Conflicts:
	protected/controllers/ArtistController.php