Monday work.  Some modifications in grid entity hierarchy, changes to PlayerComparator in order to explore origin from "duplicate key value in a unique or primary key constraint or unique index identified by 'SQL110322082529150' defined on 'GRIDGAME_GRIDPLAYER'" in Hibernate. When SORTing is turned off, Manantiales games load, but do not initialize.  
Rolled BeadString back to Util package and changed it to a plain pojo, no longer an Entity (as sums involving beadstrings should be computable).  Other modifications due to refactor.  Now, all games can be started and loaded. Need to roll-back client side requests for games by id to get UIs working again.
Updates to get games running.  Can now load and play Gente.  Can load and play Manantiales.  Cannot load and play Pasale.  Single player games have same issue with null event.result from Blaze after game creation.  Tests for Manantiales do not pass, probably related to sorted players based on color (e.g. Hibernate sort in GridGame).  
Changes to better support Blaze in JMS layer (pushed jars into EAR lib directory).  Update to BeadString in Flexclient to work with updated BeadString.java implmentation. Watch (System.out.println) in GenteGame to track what's happening with KnowledgeBase serialization.  
Some fixes for bugs in games.  All tests now pass, although seeing issues with Pasale loading and using rules from file system.  Seeing issue in Gente agents as well as Manantiales in regards to turn changes.  Next week:  tests for these issues and fixes for remaining Flex UI issues.
Moved FlexDS sub-module to Gamesm module.  Updated Manantiales rules to work with null sets (hibernate requirement). Pasale now loads rule-flow files along with DRLs, but tests still having issue passing (no errors, now).  Games can be loaded with no errors through Hibernate.
Modifications to get GameGrid serializing properly with Hibernate and effects on changes on rules.  Can start and play Gente and Manantiales -- moves are serialized properly and grid is serialized. Issues with single player registrants and Pasale continue to exist.
Fixes to wiring for Trias and Tesseras in Gente.  Everything is now stored in the database.  Some error testing for Trias (seeing strange behavior in robot games around tessera and tria scoring and awards).  Started some work towards debugging this, but incomplete as of yet.
Merge branch 'modular' into hibernate

Conflicts:
	Deploy/MultigameWAR/pom.xml
	Deploy/MultigameWAR/src/main/webapp/WEB-INF/flex/proxy-config.xml
	Deploy/MultigameWAR/src/main/webapp/WEB-INF/flex/remoting-config.xml
	Games/FlexClient/FlexCommon/src/main/flex/assets/30601__acclivity__Goblet_F_Soft.mp3
	Games/FlexClient/FlexCommon/src/main/flex/assets/32864__oniwe__smallAudienceClapsMaleYeah.mp3
	Games/FlexClient/FlexCommon/src/main/flex/assets/49944__simon.rue__misslyckad_bana_v1.mp3
	Games/FlexClient/FlexCommon/src/main/flex/assets/706__vitriolix__pop.mp3
	Games/FlexClient/FlexCommon/src/main/flex/assets/dirt.png
	Games/FlexClient/FlexCommon/src/main/flex/assets/farm.svg
	Games/FlexClient/FlexCommon/src/main/flex/assets/forest.png
	Games/FlexClient/FlexCommon/src/main/flex/icons.fla
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/AbstractBoard.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/BoardCell.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/ChatPanel.mxml
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/GameStatus.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/HelpPanel.mxml
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/ImageAssets.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/ImagePanel.mxml
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/SmoothImage.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/SoundAssets.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/Token.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/component/TokenStore.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/Cell.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/ChatMessage.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/Game.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/GameGrid.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/GamePlayer.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/Move.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/Registrant.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/gente/GenteGame.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/gente/GentePlayer.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/gente/StrategyPlayer.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/manantiales/CheckCondition.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/manantiales/Ficha.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/manantiales/ManantialesGame.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/manantiales/ManantialesMove.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/manantiales/ManantialesPlayer.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/manantiales/SimpleAgent.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/manantiales/Suggestion.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/pasale/PasaleGame.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/pasale/PasaleMove.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/pasale/PasalePlayer.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/Color.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/CooperatiionQualifier.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/ExceptionType.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/GameEvent.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/GameState.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/MoveStatus.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/PenteStrategy.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/manantiales/Mode.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/enum/manantiales/TokenType.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/event/PlayEvent.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/event/PlayerEvent.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/event/ServiceGameEvent.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/model/interfaces/CellImplementation.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/model/interfaces/GameImplementation.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/model/interfaces/Implementation.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/model/interfaces/MoveImplementation.as
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/util/MessageReceiver.as
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GenteBoard.as
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GenteGameController.as
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GenteGameReplayController.as
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GenteGameWindow.mxml
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GenteMoveInfo.mxml
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GenteMoveViewer.as
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GentePlayerInfo.mxml
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GentePlayersViewer.as
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/PenteGameReplay.mxml
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/entity/BeadString.as
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/entity/GenteMove.as
	Games/FlexClient/FlexManantiales/src/main/flex/assets/icons.swf
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/AnnualConditionsGenerator.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/CheckConstraintAlert.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/GameInfo.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/GraphicAlert.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesBoard.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesGameController.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesWindow.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/MoveHandler.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/MoveInfo.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/MoveViewer.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/PlayerInfo.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/PlayersViewer.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/RoundCell.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionAlert.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionHandler.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionInfo.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionViewer.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/TokenHandler.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/TokenSuggestor.mxml
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/enum/ConditionType.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/enum/ManantialesEvent.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/enum/SuggestionStatus.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/ForestToken.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/ForestTokenStore.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/IntensiveToken.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/IntensiveTokenStore.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/ManantialesToken.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/ManantialesTokenStore.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/ModerateToken.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/ModerateTokenStore.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/SilvopastoralToken.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/SilvopastoralTokenStore.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/SuggestionToken.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/UndevelopedToken.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/ViveroToken.as
	Games/FlexClient/FlexManantiales/src/main/flex/mx/ecosur/multigame/manantiales/token/ViveroTokenStore.as
	Games/FlexClient/FlexMultigame/src/main/flex/assets/Verdana.ttf
	Games/FlexClient/FlexMultigame/src/main/flex/mx/ecosur/multigame/component/JoinPendingGame.mxml
	Games/FlexClient/FlexMultigame/src/main/flex/mx/ecosur/multigame/component/JoinUnfinishedGame.mxml
	Games/FlexClient/FlexMultigame/src/main/flex/mx/ecosur/multigame/component/Lobby.mxml
	Games/FlexClient/FlexMultigame/src/main/flex/mx/ecosur/multigame/component/StartNewGame.mxml
	Games/FlexClient/FlexPasale/pom.xml
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/ColonizerAlert.mxml
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/PasaleBoard.as
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/PasaleBox.as
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/PasaleGameController.as
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/PasaleGameWindow.mxml
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/PlayerInfo.mxml
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/ScoreBoard.mxml
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleFicha.as
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleGrid.as
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/entity/Territory.as
	Games/FlexClient/FlexPasale/src/main/flex/mx/ecosur/multigame/pasale/enum/UseType.as
	Games/FlexClient/FlexPasale/src/main/flex/style.css
	Games/FlexClient/pom.xml
	Games/FlexClient/src/main/flex/PenteGameReplay.mxml
	Games/FlexClient/src/main/flex/assets/30601__acclivity__Goblet_F_Soft.mp3
	Games/FlexClient/src/main/flex/assets/32864__oniwe__smallAudienceClapsMaleYeah.mp3
	Games/FlexClient/src/main/flex/assets/49944__simon.rue__misslyckad_bana_v1.mp3
	Games/FlexClient/src/main/flex/assets/706__vitriolix__pop.mp3
	Games/FlexClient/src/main/flex/assets/Verdana.ttf
	Games/FlexClient/src/main/flex/assets/dirt.png
	Games/FlexClient/src/main/flex/assets/farm.svg
	Games/FlexClient/src/main/flex/assets/forest.png
	Games/FlexClient/src/main/flex/assets/icons.swf
	Games/FlexClient/src/main/flex/icons.fla
	Games/FlexClient/src/main/flex/main.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/AbstractBoard.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/BoardCell.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/ChatPanel.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/GameStatus.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/HelpPanel.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/ImageAssets.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/ImagePanel.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/JoinPendingGame.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/JoinUnfinishedGame.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/Lobby.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/SmoothImage.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/SoundAssets.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/StartNewGame.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/Token.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/component/TokenStore.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/entity/Game.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/entity/GameGrid.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/entity/GamePlayer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/entity/Move.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/entity/Registrant.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/enum/Color.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/enum/CooperatiionQualifier.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/enum/ExceptionType.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/enum/GameEvent.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/enum/GameState.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/enum/MoveStatus.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/enum/PenteStrategy.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/event/PlayEvent.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/event/PlayerEvent.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/event/ServiceGameEvent.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteBoard.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteGameController.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteGameReplayController.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteGameWindow.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteMoveInfo.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteMoveViewer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GentePlayerInfo.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GentePlayersViewer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/gente/entity/StrategyPlayer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/AnnualConditionsGenerator.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/CheckConstraintAlert.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/GameInfo.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/GraphicAlert.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesBoard.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesGameController.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesWindow.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/MoveHandler.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/MoveInfo.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/MoveViewer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/PlayerInfo.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/PlayersViewer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/RoundCell.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionAlert.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionHandler.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionInfo.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionViewer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/TokenHandler.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/TokenSuggestor.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/CheckCondition.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/Ficha.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/ManantialesGame.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/ManantialesMove.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/ManantialesPlayer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/SimpleAgent.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/Suggestion.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/ConditionType.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/ManantialesEvent.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/Mode.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/SuggestionStatus.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/TokenType.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ForestToken.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ForestTokenStore.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/IntensiveToken.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/IntensiveTokenStore.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ManantialesToken.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ManantialesTokenStore.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ModerateToken.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ModerateTokenStore.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/SilvopastoralToken.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/SilvopastoralTokenStore.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/SuggestionToken.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/UndevelopedToken.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ViveroToken.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ViveroTokenStore.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/ColonizerAlert.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PasaleBoard.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PasaleBox.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PasaleGameController.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PasaleGameWindow.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PlayerInfo.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/ScoreBoard.mxml
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleFicha.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleGame.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleGrid.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleMove.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasalePlayer.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/Territory.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/enum/UseType.as
	Games/FlexClient/src/main/flex/mx/ecosur/multigame/util/MessageReceiver.as
	Games/FlexClient/src/main/flex/style.css
	Games/FlexClient/src/main/resources/locales/en_US/StringsBundle.properties
	Games/FlexClient/src/main/resources/locales/es_ES/StringsBundle.properties
	Games/FlexClient/src/main/resources/messaging-config.xml
	MultiGamePrivate/FlexClient/pom.xml
	MultiGamePrivate/FlexClient/src/main/flex/PenteGameReplay.mxml
	MultiGamePrivate/FlexClient/src/main/flex/assets/30601__acclivity__Goblet_F_Soft.mp3
	MultiGamePrivate/FlexClient/src/main/flex/assets/32864__oniwe__smallAudienceClapsMaleYeah.mp3
	MultiGamePrivate/FlexClient/src/main/flex/assets/49944__simon.rue__misslyckad_bana_v1.mp3
	MultiGamePrivate/FlexClient/src/main/flex/assets/706__vitriolix__pop.mp3
	MultiGamePrivate/FlexClient/src/main/flex/assets/Verdana.ttf
	MultiGamePrivate/FlexClient/src/main/flex/assets/dirt.png
	MultiGamePrivate/FlexClient/src/main/flex/assets/farm.svg
	MultiGamePrivate/FlexClient/src/main/flex/assets/forest.png
	MultiGamePrivate/FlexClient/src/main/flex/assets/icons.swf
	MultiGamePrivate/FlexClient/src/main/flex/icons.fla
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/AbstractBoard.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/BoardCell.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/ChatPanel.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/GameStatus.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/HelpPanel.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/ImageAssets.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/ImagePanel.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/JoinPendingGame.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/JoinUnfinishedGame.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/Lobby.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/SmoothImage.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/SoundAssets.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/StartNewGame.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/Token.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/component/TokenStore.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/entity/Game.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/entity/GameGrid.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/entity/GamePlayer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/entity/Move.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/entity/Registrant.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/enum/Color.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/enum/CooperatiionQualifier.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/enum/ExceptionType.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/enum/GameEvent.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/enum/GameState.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/enum/MoveStatus.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/enum/PenteStrategy.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/event/PlayEvent.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/event/PlayerEvent.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/event/ServiceGameEvent.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteBoard.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteGameController.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteGameReplayController.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteGameWindow.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteMoveInfo.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GenteMoveViewer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GentePlayerInfo.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/GentePlayersViewer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/gente/entity/StrategyPlayer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/AnnualConditionsGenerator.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/CheckConstraintAlert.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/GameInfo.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/GraphicAlert.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesBoard.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesGameController.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/ManantialesWindow.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/MoveHandler.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/MoveInfo.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/MoveViewer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/PlayerInfo.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/PlayersViewer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/RoundCell.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionAlert.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionHandler.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionInfo.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/SuggestionViewer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/TokenHandler.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/TokenSuggestor.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/CheckCondition.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/Ficha.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/ManantialesGame.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/ManantialesMove.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/ManantialesPlayer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/SimpleAgent.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/entity/Suggestion.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/ConditionType.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/ManantialesEvent.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/Mode.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/SuggestionStatus.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/enum/TokenType.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ForestToken.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ForestTokenStore.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/IntensiveToken.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/IntensiveTokenStore.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ManantialesToken.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ManantialesTokenStore.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ModerateToken.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ModerateTokenStore.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/SilvopastoralToken.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/SilvopastoralTokenStore.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/SuggestionToken.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/UndevelopedToken.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ViveroToken.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/manantiales/token/ViveroTokenStore.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/ColonizerAlert.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PasaleBoard.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PasaleBox.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PasaleGameController.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PasaleGameWindow.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/PlayerInfo.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/ScoreBoard.mxml
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleFicha.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleGame.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleGrid.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasaleMove.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/PasalePlayer.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/entity/Territory.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/pasale/enum/UseType.as
	MultiGamePrivate/FlexClient/src/main/flex/mx/ecosur/multigame/util/MessageReceiver.as
	MultiGamePrivate/FlexClient/src/main/flex/style.css
Removed supporting files pulled into commit during large merge with Max's modifications.

Signed-off-by: Andrew Waterman <andrew.waterman@gmail.com>
Cherry-pick of from commit stack to bring in missing code and references.

Conflicts:

	.gitignore
	Games/FlexClient/FlexCommon/src/main/flex/mx/ecosur/multigame/entity/gente/GentePlayer.as
	Games/FlexClient/FlexGente/src/main/flex/mx/ecosur/multigame/gente/GenteGameController.as
	Games/FlexClient/FlexMultigame/src/main/flex/mx/ecosur/multigame/component/StartNewGame.mxml
	Games/FlexClient/src/main/resources/locales/en_US/StringsBundle.properties
	Games/FlexClient/src/main/resources/locales/es_ES/StringsBundle.properties
	Games/Gente/src/main/java/mx/ecosur/multigame/impl/entity/gente/GenteGame.java
	Games/Gente/src/main/java/mx/ecosur/multigame/impl/entity/gente/GenteStrategyAgent.java
	Games/Gente/src/main/java/mx/ecosur/multigame/impl/entity/gente/Tria.java

Signed-off-by: Andrew Waterman <andrew.waterman@gmail.com>
Minor changes to Tria and Tessera entities, updates to Flex modules to be a) more explicit about variable to services-config.xml and b) correct issue in FlexMultigame where services was not being passed to the compiler by FlexMojos.

Signed-off-by: Andrew Waterman <andrew.waterman@gmail.com>
Fix for flex side of Manantiales to keep games from starting before all players are registered, along with update to remove token box when move is made.  Still no resolution for Set of CheckCondition issue in MG.
Fixed issues with transactions during lobby query actions.  ManantialesGame(s) triggered the condition only due to the complexity of their object graphs which introduced a delay that forced the queries to not be able to get a lock in time (due to two transactions running in EJB).  Migrated naming conventions in GridCommon to use more useful "entity" label.
Small fix to persistence.xml in order to remove redundant enum from JPA entity search.  Removed Pasale reference from StartNewGame screen.
Modifications to pom.xml build schema.
Clean up around EM operations.
Started bringing in configuration files for jboss.  Changed hibernate annotations version to be compatible with JBoss 6.
Start of pasale work, some changes for debugging and prep, etc.
Updates to get Pasale working as a game again.  Still seeing some delays in handling moves, and need to improve board redraw.  Token graph working, but should be keyed to moves over play not seconds in time.