imagenes 1
Merge origin/master

Conflicts:
	application/views/clients/banner.php