Officina modificada
Officina modificada
Officina modificada
Office deleted for conflict resolv
Merge origin/master

Conflicts:
	src/es/unileon/ulebank/office/Office.java
Merge the class office manually and others modification are from automatic merge between control and control-integration.
Fixed some minor errors
Fixed some error compilation in test