imaganes y mockups
Faltan las funciones de success y fail para subir imagenes
Merge origin/master

Conflicts:
	application/controllers/imagenes.php
	application/views/clients/banner.php