fixat var options visas
Merge branch 'options'

Conflicts:
	app/views/main.scala.html