Merge branch 'M&M's' of https://github.com/Arquisoft/ObservaTerra11 into M&M's

Conflicts:
	app/views/bars.scala.html
fdsa

fdas