GS2 apache server had issues launching because it thought setup.bat had already been run in recent changes to setup.bat. Now strengthening that test. Also Committing updated server.jar since it contains recent changes made for GS3