inicio de ajustes bd
Merge branch 'master' of https://github.com/dimortizp/tecnet into dimortizp-master

Conflicts:
	protected/runtime/application.log