session
why god why?
Merge branch 'master' of https://github.com/scferrada/BarcelonaFC.git

Conflicts:
	Barcelona FC.iws
	src/controller/SocioBean.java
	src/controller/UsuarioBean.java
Start testing
Merge branch 'master' of https://github.com/scferrada/BarcelonaFC.git

Conflicts:
	Barcelona FC.iws
hfgh
Merge branch 'master' of https://github.com/scferrada/BarcelonaFC.git

Conflicts:
	Barcelona FC.iws
	src/entity/TipoActivoEntity.java
Tests 1.0
Merge branch 'master' of https://github.com/scferrada/BarcelonaFC.git

Conflicts:
	Barcelona FC.iws