dependencias
Merge branch 'master' of github.com:Innoto/cogumelo

Conflicts:
	c_classes/CogumeloClass.php
Merge branch 'master' of github.com:Innoto/cogumelo
sistema de carga de modulos e carga inicial separados
Merge branch 'master' of github.com:Innoto/cogumelo

Conflicts:
	c_packages/base_app/c_app/conf/setup.dev.php