Merge origin/master

Conflicts:
	WarLOTR/nbproject/project.properties
	WarLOTR/src/dao/RegiaoDAO.java
	WarLOTR/src/dao/impl/BatalhaDAOImpl.java
	WarLOTR/src/dao/impl/FaccaoDAOImpl.java
	WarLOTR/src/dao/impl/HistoricoTerritorioDAOImpl.java
	WarLOTR/src/dao/impl/JogadorDAOImpl.java
	WarLOTR/src/dao/impl/RegiaoDAOImpl.java
	WarLOTR/src/dao/impl/TerritorioDAOImpl.java
Merge origin/master
Merge origin/master

Conflicts:
	WarLOTR/nbproject/project.properties
	WarLOTR/src/dao/RegiaoDAO.java
	WarLOTR/src/dao/impl/BatalhaDAOImpl.java
	WarLOTR/src/dao/impl/FaccaoDAOImpl.java
	WarLOTR/src/dao/impl/HistoricoTerritorioDAOImpl.java
	WarLOTR/src/dao/impl/JogadorDAOImpl.java
	WarLOTR/src/dao/impl/RegiaoDAOImpl.java
	WarLOTR/src/dao/impl/TerritorioDAOImpl.java