Merge pull request #28 from Arquisoft/Gamma

Gamma
Logout cucumber
Steps and features
Merge pull request #29 from Arquisoft/Gamma

Pruebas cucumber
Merge pull request #30 from Arquisoft/pruebas-cucumber

Pruebas cucumber
xml bug
Access cucumber
XML Completamente funcional
XML Completamente funcional v2
bootstrap added :)
Merge remote-tracking branch 'origin/pruebas-cucumber' into Gamma
Merge branch 'Gamma' of https://github.com/Arquisoft/ObservaTerra11 into Gamma
Corregido directorio descarga XML
Fixed issues

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

Conflicts:
	app/views/addIndicator.scala.html
	app/views/index.scala.html
	app/views/login.scala.html
	app/views/register.scala.html
	public/stylesheets/bootstrap.css
Merge branch 'Gamma' of https://github.com/Arquisoft/ObservaTerra11 into Gamma
Cambiando pocas cosas del css
Merge branch 'Gamma' of https://github.com/Arquisoft/ObservaTerra11 into Gamma