Merge branch 'Frontend' of https://github.com/Arquisoft/ObservaTerra11 into Frontend

Conflicts:
	app/views/esquema/adminBorrar.scala.html
	app/views/esquema/adminBorrarDatos.scala.html
	app/views/esquema/adminBorrarDatosErroneos.scala.html