Merge pull request #1 from dimortizp/master

Server publish
Fixed minor trouble
fixed 2
save
	deleted:    protected/runtime/application.log
as
Merge branch 'desarrollo' of https://github.com/cesaenzv/tecnet into desarrollo
cambios
Merge branch 'master' of https://github.com/cesaenzv/tecnet

Conflicts:
	protected/runtime/application.log
Merge remote-tracking branch 'carlos/desarrollo'

Conflicts:
	protected/runtime/application.log
merge