bootstrap added :)
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