interfaz web modificada
Merge branch 'web' of https://github.com/Arquisoft/Entrecine3.git into
web

Conflicts:
	RamaWeb/app/views/index.scala.html