test2
recurso
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/adm/recurso/__init__.py