Se ajusta
se elimina directorio sin uso
renombre
Merge remote-tracking branch 'ms-template/master' into develope

Conflicts:
	ms-service/src/main/scala/co/s4n/template/web/TemplateRoutingService.scala
Se renombra