giignore
svn rev 42
merge svn rev 42

Conflicts:
	TeraCommon/pom.xml
	TeraCommon/src/main/java/com/angelis/tera/common/network/AbstractServer.java
	TeraGame/pom.xml
	TeraGame/src/main/java/com/angelis/tera/game/ai/AI.java
	TeraGame/src/main/java/com/angelis/tera/game/ai/events/enums/EventHandlerEnum.java
	TeraGame/src/main/java/com/angelis/tera/game/ai/events/handlers/AttackedEventHandler.java
	TeraGame/src/main/java/com/angelis/tera/game/ai/events/handlers/NotSeePlayerEventHandler.java
	TeraGame/src/main/java/com/angelis/tera/game/ai/events/handlers/SeePlayerEventHandler.java
	TeraGame/src/main/java/com/angelis/tera/game/domain/entity/database/AccountEntity.java
	TeraGame/src/main/java/com/angelis/tera/game/domain/entity/database/ZoneEntity.java
	TeraGame/src/main/java/com/angelis/tera/game/domain/mapper/database/AccountMapper.java
	TeraGame/src/main/java/com/angelis/tera/game/domain/mapper/database/PlayerMapper.java
	TeraGame/src/main/java/com/angelis/tera/game/presentation/network/SystemMessages.java
	TeraGame/src/main/java/com/angelis/tera/game/presentation/network/packet/ClientPacketHandler.java
	TeraGame/src/main/java/com/angelis/tera/game/presentation/network/packet/ServerPacketHandler.java
	TeraGame/src/main/java/com/angelis/tera/game/presentation/network/packet/client/CM_ENTER_WORLD.java
	TeraGame/src/main/java/com/angelis/tera/game/presentation/network/packet/client/CM_LOAD_TOPO_FIN.java
	TeraGame/src/main/java/com/angelis/tera/game/presentation/network/packet/server/SM_DROP_ITEM_LOOT.java
	TeraGame/src/main/java/com/angelis/tera/game/process/command/admin/SendFakePacketCommand.java
	TeraGame/src/main/java/com/angelis/tera/game/process/controllers/CreatureController.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/account/Account.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/campfire/CampFire.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/creature/Creature.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/drop/DropItem.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/enums/ObjectFamilyEnum.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/gameobject/GameObject.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/gather/Gather.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/player/Player.java
	TeraGame/src/main/java/com/angelis/tera/game/process/model/visible/VisibleTeraObject.java
	TeraGame/src/main/java/com/angelis/tera/game/process/services/AdminService.java
	TeraGame/src/main/java/com/angelis/tera/game/process/services/PlayerService.java
	TeraGame/src/main/java/com/angelis/tera/game/process/services/WorldService.java
	TeraGame/src/main/java/com/angelis/tera/game/process/services/ZoneService.java
	TeraGame/src/main/java/com/angelis/tera/game/utils/DateUtils.java
	TeraLauncher/pom.xml
	TeraLogin/pom.xml
	TeraTools/pom.xml