mierda
Merge branch 'master' of https://github.com/ramsodev/DitaManagement

Conflicts:
	framework/conf/.gitignore