Conf. clientes
Merge branch 'master' of https://github.com/savepap20141-TP/SCITEMAVTP2014.git