View results
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/routes
add results dynamically
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala
	app/views/admin_results.scala.html
Merge remote-tracking branch 'origin/master'