cambios que faltaban
Merge branch 'master' of https://github.com/ramsodev/DitaManagement

Conflicts:
	interface/DitaManagement/src/net/ramso/dita/web/filters/DitaManagementContextListener.java
eliminado el direcotrio conf