Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/artiste/profil.php
	assets/css/profila.css