merged features

Conflicts:
	Departamento.py
	test_departamento.py
merged features

Conflicts:
	Departamento.py
	test_departamento.py
merged features

Conflicts:
	Departamento.py
	test_departamento.py
empresa-0.2
empresa-0.3