se agrego catalogos

se agrego catalogos
se agrego catalogos
Merge branch 'master' of https://github.com/agavesoft/estancia

Conflicts:
	module/Estancia/view/layout/layout.phtml