Merge master branch to local
Merge branch 'master' of https://github.com/9124SAVOIAD/SimSys

Conflicts:
	Game
Generator/src/edu/utdallas/gamegeneratorcollection/ComponentSelection/In
putWizard.java
Merge Conflict update