some small changes
Merge branch 'master' into simple_css

fixed

Conflicts:
	app/views/answer_finished.erb