Howseriano cambia diseño
howseriano cambia diseño again
Merge remote-tracking branch 'origin/master'

Conflicts:
	DirecTEL/assets/www/js/directel.js