Adds more general stuff to Question, rest to Quiz
Makes QuestionView and QuizView conform to model
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk.git

Conflicts:
	Test Game/test-game/src/com/testgame/Views/MapView.java
	Test Game/test-game/src/com/testgame/Views/NextPlayerView.java
	Test Game/test-game/src/com/testgame/Views/QuestionView.java