Añadida funcionalidad de editar peliculas en administracion
Merge branch 'master' of https://github.com/Arquisoft/Entrecine2.git
Merge branch 'master' of https://github.com/Arquisoft/Entrecine2.git
Merge branch 'master' of https://github.com/Arquisoft/Entrecine2.git

Conflicts:
	app/controllers/Administracion.java
Merge de sesiones y peliculas
Merge branch 'master' of https://github.com/Arquisoft/Entrecine2.git
Merge branch 'master' of https://github.com/Arquisoft/Entrecine2.git