Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
.
Pago Servicio
Save equipo

Modificacion dropdownlist
Save equipo fixed
ajustes
Merge branch 'master' of https://github.com/cesaenzv/tecnet

Conflicts:
	protected/runtime/application.log
Merge pull request #1 from dimortizp/master

Server publish