Use shorter form for rendering partials
Minor fixes in specs
Fix a bug
Quiz-Questions is now a one-to-many association
Merge branch 'master' into question-order

Conflicts:
	app/models/quiz.rb
	app/views/questions/_question_short.html.haml
	app/views/questions/index.html.haml
	config/routes.rb
	db/structure.sql
	spec/controllers/games_controller_spec.rb
	spec/controllers/questions_controller_spec.rb
	spec/models/quiz_spec.rb