Virage

Version del 8/28/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	Empleados/ReportesEmpleados.php