Refactoring names
story
Merge branch 'develop' into gameView

Conflicts:
	.idea/workspace.xml
	JavaFxApplication.iml
	out/production/JavaFxApplication/fr/doctorj/screens/gameView.fxml
	src/fr/doctorj/screens/gameView.fxml
	src/fr/doctorj/screens/generator.fxml