Fix link Om Hybrida
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layoutTop.scala.html
Merge branch 'master' of github.com:hybrida/hybridaweb2-play
Merge branch 'master' of github.com:hybrida/hybridaweb2-play
Merge branch 'master' of github.com:hybrida/hybridaweb2-play
Merge branch 'master' of github.com:hybrida/hybridaweb2-play
Merge branch 'master' of github.com:hybrida/hybridaweb2-play
Merge branch 'master' of github.com:hybrida/hybridaweb2-play
Change background
Merge remote-tracking branch 'origin/master'