Reparado fallo en el filtro
Merge branch 'master' of https://github.com/Arquisoft/Entrecine2.git

Conflicts:
	app/controllers/filters/FiltroAdministrador.java