Checkstyle changes to gamegenerationcollection.componentCreation classes.
Merge cleanup.
Merge branch 'localBranchSean'

Conflicts:
	Game Generator/Office, Classroom/areaSelection.xml
	Game Generator/gamexml/TestGame1_Variations/TestGame1-Final.xml
	Game Generator/src/edu/utdallas/gamegeneratorcollection/ComponentSelection/InputWizard.java
	Game Generator/src/edu/utdallas/gamewizard/Act2.java
	Game Generator/src/edu/utdallas/gamewizard/AreaSelection.java
	Game Generator/src/edu/utdallas/gamewizard/Domain.java
	Game Generator/src/edu/utdallas/gamewizard/Grade.java
	Game Generator/src/edu/utdallas/gamewizard/Institution.java
	Game Generator/src/edu/utdallas/gamewizard/KnowledgeArea.java
	Game Generator/src/edu/utdallas/gamewizard/KnowledgeRepo.java
	Game Generator/src/edu/utdallas/gamewizard/Profile2.java
	Game Generator/src/edu/utdallas/gamewizard/Scene2.java
	Game Generator/src/edu/utdallas/gamewizard/Screen2.java
	Game Generator/src/edu/utdallas/gamewizard/SubKnowledgeArea.java
	Game Generator/src/edu/utdallas/gamewizard/Subject.java
	Game Generator/src/edu/utdallas/gamewizard/SuggQuestion.java
	Game Generator/src/edu/utdallas/previewtool/ErrorChecker/GameErrorChecker.java
	Game Generator/src/edu/utdallas/previewtool/ErrorChecker/package-info.java
	Game Generator/src/edu/utdallas/previewtool/Errors/GameErrorList.java
	Game Generator/src/edu/utdallas/previewtool/Errors/PreviewError.java
	Game Generator/src/edu/utdallas/previewtool/Errors/package-info.java
	Game Generator/src/edu/utdallas/previewtool/UserInterface/AssetSelectionWindows/BackgroundSelectWindow.java
	Game Generator/src/edu/utdallas/previewtool/UserInterface/AssetSelectionWindows/CharacterSelectWindow.java
	Game Generator/src/edu/utdallas/previewtool/UserInterface/AssetSelectionWindows/PropSelectWindow.java
	Game Generator/src/edu/utdallas/previewtool/UserInterface/AssetSelectionWindows/SoundSelectWindow.java
	Game Generator/src/edu/utdallas/previewtool/UserInterface/AssetSelectionWindows/package-info.java
	Game Generator/src/edu/utdallas/previewtool/UserInterface/CharacterProfileWindow.java
	Game Generator/src/edu/utdallas/previewtool/UserInterface/ScenePanel.java
	Game Generator/src/edu/utdallas/previewtool/UserInterface/package-info.java