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
cambios
Merge branch 'master' of https://github.com/cesaenzv/tecnet
modificación crear orden
Merge pull request #2 from dimortizp/master

Al dia con Diego